diff --git a/app-arch/file-roller/Manifest b/app-arch/file-roller/Manifest
index 845d036ddda0..b5e56d7d4f5b 100644
--- a/app-arch/file-roller/Manifest
+++ b/app-arch/file-roller/Manifest
@@ -1,3 +1,2 @@
-DIST file-roller-3.14.2.tar.xz 1387784 SHA256 1815e736715afe8c0f3fbda41c76c07289220d4855345f779c632adf5e074e50 SHA512 92ff42e4fe06e3ea54e71806157fbb95f9e5f247142e9e857f61f61748fd0e1b99a73cfb35fd3ea890c3e19da0d2176af9a017a8eb918eff9ddc0371b09ed11d WHIRLPOOL db4e5519fe298759dbb0f048a597d4cd8ef6610b04eab9f77ee21905726f19e15312cdfc47aa80c2f55490ad4f400e7cac0664e24376b40a340d780e5f0809bf
-DIST file-roller-3.16.3.tar.xz 1411360 SHA256 2b3a1111caba26e67b96559a3118a700dbfb6a4c6ad7ebd3e509df227995411c SHA512 999d08d6ea5ae975a026c351c5f216fd503b78eb65e8f417f8afdce152c816f631bd5c6b1a430a5baefa19541e3d718c59beef4773242a6ba087479061ed42ea WHIRLPOOL 2534ae5ad2bb3886d4963bb30a5ef67a82c698f74d64fc0ddc1cac0a37ab258b4fa7e569d031ec1a715a0d3f99b70aae54d16f88d18b95ce7f77654cede4f176
 DIST file-roller-3.16.4.tar.xz 1412224 SHA256 5455980b2c9c7eb063d2d65560ae7ab2e7f01b208ea3947e151680231c7a4185 SHA512 76378e16cd7f37a336b3eb3c6106cf36c2ea6e9209c23175810e2b80dc13a7b62b04cfcdea0b2bf69251baf7b164e85c34d99813cdbfd07433f73aba9c7361ae WHIRLPOOL 0d8736e13b97a4a005ae53bd9885b10c8a7797e10e0d8f4548e4112490ebc3ce91b0e5349b251bdca5d0f392318be7ea4fb324e3399300e362f47b024217849d
+DIST file-roller-3.16.5.tar.xz 1415236 SHA256 09a68db98aa33febdad76e6977d7771b3b444da7f57ab6f4fe7d6a77e39d5a91 SHA512 83c8dddb547f36faa2728996648479255353706a266ce26e79f8f6141794d0281a9817f2a1dc687623ba8382cab93aef23675e2f3ef6d4abb9f8871f253d2c2d WHIRLPOOL 01d54e45d9d8b81c5f965622adbacac1400f56461e230999e97aa1cde135714e7e80317749c04eac7b4a49fea0fa66142b9dfbec0876b743b4709d3d17c72cce
diff --git a/app-arch/file-roller/file-roller-3.14.2.ebuild b/app-arch/file-roller/file-roller-3.14.2.ebuild
deleted file mode 100644
index ff19e68f6da2..000000000000
--- a/app-arch/file-roller/file-roller-3.14.2.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit eutils gnome2 readme.gentoo
-
-DESCRIPTION="Archive manager for GNOME"
-HOMEPAGE="http://fileroller.sourceforge.net/ https://wiki.gnome.org/Apps/FileRoller"
-
-LICENSE="GPL-2+ CC-BY-SA-3.0"
-SLOT="0"
-IUSE="nautilus packagekit"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
-
-# gdk-pixbuf used extensively in the source
-# cairo used in eggtreemultidnd.c
-# pango used in fr-window
-RDEPEND="
-	>=app-arch/libarchive-3:=
-	>=dev-libs/glib-2.36:2
-	>=dev-libs/json-glib-0.14
-	>=x11-libs/gtk+-3.13.2:3
-	>=x11-libs/libnotify-0.4.3:=
-	sys-apps/file
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	x11-libs/pango
-	nautilus? ( >=gnome-base/nautilus-3 )
-	packagekit? ( app-admin/packagekit-base )
-"
-DEPEND="${RDEPEND}
-	dev-util/desktop-file-utils
-	>=dev-util/intltool-0.40.0
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-# eautoreconf needs:
-#	gnome-base/gnome-common
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="
-${PN} is a frontend for several archiving utilities. If you want a
-particular archive format support, see ${HOMEPAGE}
-and install the relevant package. For example:
-7-zip   - app-arch/p7zip
-ace     - app-arch/unace
-arj     - app-arch/arj
-cpio    - app-arch/cpio
-deb     - app-arch/dpkg
-iso     - app-cdr/cdrtools
-jar,zip - app-arch/zip and app-arch/unzip
-lha     - app-arch/lha
-lzop    - app-arch/lzop
-rar     - app-arch/unrar or app-arch/unar
-rpm     - app-arch/rpm
-unstuff - app-arch/stuffit
-zoo     - app-arch/zoo"
-
-src_prepare() {
-	# Use absolute path to GNU tar since star doesn't have the same
-	# options. On Gentoo, star is /usr/bin/tar, GNU tar is /bin/tar
-	epatch "${FILESDIR}"/${PN}-2.10.3-use_bin_tar.patch
-
-	# File providing Gentoo package names for various archivers
-	cp -f "${FILESDIR}/3.6.0-packages.match" data/packages.match || die
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README* TODO"
-	# --disable-debug because enabling it adds -O0 to CFLAGS
-	gnome2_src_configure \
-		--disable-run-in-place \
-		--disable-static \
-		--disable-debug \
-		--enable-magic \
-		--enable-libarchive \
-		$(use_enable nautilus nautilus-actions) \
-		$(use_enable packagekit) \
-		ITSTOOL=$(type -P true)
-}
-
-src_install() {
-	gnome2_src_install
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	readme.gentoo_print_elog
-}
diff --git a/app-arch/file-roller/file-roller-3.16.4.ebuild b/app-arch/file-roller/file-roller-3.16.4.ebuild
deleted file mode 100644
index e7b996548fa7..000000000000
--- a/app-arch/file-roller/file-roller-3.16.4.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit eutils gnome2 readme.gentoo
-
-DESCRIPTION="Archive manager for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/FileRoller"
-
-LICENSE="GPL-2+ CC-BY-SA-3.0"
-SLOT="0"
-IUSE="nautilus packagekit"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
-
-# gdk-pixbuf used extensively in the source
-# cairo used in eggtreemultidnd.c
-# pango used in fr-window
-RDEPEND="
-	>=app-arch/libarchive-3:=
-	>=dev-libs/glib-2.36:2
-	>=dev-libs/json-glib-0.14
-	>=x11-libs/gtk+-3.13.2:3
-	>=x11-libs/libnotify-0.4.3:=
-	sys-apps/file
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	x11-libs/pango
-	nautilus? ( >=gnome-base/nautilus-3 )
-	packagekit? ( app-admin/packagekit-base )
-"
-DEPEND="${RDEPEND}
-	dev-util/desktop-file-utils
-	>=dev-util/intltool-0.40.0
-	dev-util/itstool
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-# eautoreconf needs:
-#	gnome-base/gnome-common
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="
-${PN} is a frontend for several archiving utilities. If you want a
-particular archive format support, see ${HOMEPAGE}
-and install the relevant package. For example:
-7-zip   - app-arch/p7zip
-ace     - app-arch/unace
-arj     - app-arch/arj
-cpio    - app-arch/cpio
-deb     - app-arch/dpkg
-iso     - app-cdr/cdrtools
-jar,zip - app-arch/zip and app-arch/unzip
-lha     - app-arch/lha
-lzop    - app-arch/lzop
-rar     - app-arch/unrar or app-arch/unar
-rpm     - app-arch/rpm
-unstuff - app-arch/stuffit
-zoo     - app-arch/zoo"
-
-src_prepare() {
-	# File providing Gentoo package names for various archivers
-	cp -f "${FILESDIR}"/3.6.0-packages.match data/packages.match || die
-	gnome2_src_prepare
-}
-
-src_configure() {
-	DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README* TODO"
-	# --disable-debug because enabling it adds -O0 to CFLAGS
-	gnome2_src_configure \
-		--disable-run-in-place \
-		--disable-static \
-		--disable-debug \
-		--enable-magic \
-		--enable-libarchive \
-		$(use_enable nautilus nautilus-actions) \
-		$(use_enable packagekit)
-}
-
-src_install() {
-	gnome2_src_install
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	readme.gentoo_print_elog
-}
diff --git a/app-arch/file-roller/file-roller-3.16.3.ebuild b/app-arch/file-roller/file-roller-3.16.5.ebuild
similarity index 98%
rename from app-arch/file-roller/file-roller-3.16.3.ebuild
rename to app-arch/file-roller/file-roller-3.16.5.ebuild
index b6fda2e40e9c..0005443af739 100644
--- a/app-arch/file-roller/file-roller-3.16.3.ebuild
+++ b/app-arch/file-roller/file-roller-3.16.5.ebuild
@@ -6,7 +6,7 @@ EAPI="5"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 
-inherit eutils gnome2 readme.gentoo
+inherit eutils gnome2 readme.gentoo-r1
 
 DESCRIPTION="Archive manager for GNOME"
 HOMEPAGE="https://wiki.gnome.org/Apps/FileRoller"
diff --git a/app-arch/file-roller/files/file-roller-2.10.3-use_bin_tar.patch b/app-arch/file-roller/files/file-roller-2.10.3-use_bin_tar.patch
deleted file mode 100644
index edaa16c1c6bb..000000000000
--- a/app-arch/file-roller/files/file-roller-2.10.3-use_bin_tar.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -uNr file-roller-2.10.3/src/fr-command-tar.c file-roller-2.10.3.patched/src/fr-command-tar.c
---- file-roller-2.10.3/src/fr-command-tar.c	2005-04-22 18:39:22.000000000 +0200
-+++ file-roller-2.10.3.patched/src/fr-command-tar.c	2005-06-06 14:29:45.000000000 +0200
-@@ -225,7 +225,7 @@
- 	if (command != NULL)
- 		fr_process_begin_command (comm->process, command);
- 	else
--		fr_process_begin_command (comm->process, "tar");
-+		fr_process_begin_command (comm->process, "/bin/tar");
- 	g_free (command);
- }
- 
diff --git a/app-crypt/signify/Manifest b/app-crypt/signify/Manifest
new file mode 100644
index 000000000000..980110ec5498
--- /dev/null
+++ b/app-crypt/signify/Manifest
@@ -0,0 +1 @@
+DIST signify-17.tar.gz 92347 SHA256 275fccb9197d8a8efe47f2b49f9aa2319002c1da8a454bf90e6332ecc214db4d SHA512 2b20e2c2d073c1ff695b6ec0b9b90e0870c6bd60dc107b428090f3c66f8e215473779d824fcd5c3b0ade429071b99336ce066c3254e286be2aa4e4a312742404 WHIRLPOOL 3124c499cc1bb234272b8f4dba206729cf89a1b821615dce8039bd1d225d87c0d9e8dc1902e305d7d47cfdad12286a9562007446205a15672721ad67477a57fd
diff --git a/app-crypt/signify/metadata.xml b/app-crypt/signify/metadata.xml
new file mode 100644
index 000000000000..582e37e24b75
--- /dev/null
+++ b/app-crypt/signify/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+                <email>patrick@gentoo.org</email>
+                <name>Patrick Lauer</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-crypt/signify/signify-17.ebuild b/app-crypt/signify/signify-17.ebuild
new file mode 100644
index 000000000000..6315b12e4797
--- /dev/null
+++ b/app-crypt/signify/signify-17.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="Cryptographically sign and verify files"
+HOMEPAGE="http://www.openbsd.org/ https://github.com/aperezdc/signify"
+SRC_URI="https://github.com/aperezdc/signify/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-1"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND=""
+DEPEND=""
diff --git a/app-emulation/containerd/Manifest b/app-emulation/containerd/Manifest
new file mode 100644
index 000000000000..28726221b052
--- /dev/null
+++ b/app-emulation/containerd/Manifest
@@ -0,0 +1 @@
+DIST containerd-0.2.0.tar.gz 635248 SHA256 1462e0c233763800b91ac2a670d82994ba1988560928e153f751fb1c0a6608c0 SHA512 381c0a21733fb79e90364649b46cbdadbc32d07245bd7a320465f6619ee5895e9552b7cc4393cb8d409295a7b867b7e461c079715cf1938e6313d4b888d81518 WHIRLPOOL d4e70a8be832227be671c13b77242a790cdf8645ff294c31d72e8cf01de2b30b9d78c691a156624adb004de42af6f133cb88b46aff37a33bc94d72bf87a0ee8a
diff --git a/app-emulation/containerd/containerd-0.2.0.ebuild b/app-emulation/containerd/containerd-0.2.0.ebuild
new file mode 100644
index 000000000000..c840962b287c
--- /dev/null
+++ b/app-emulation/containerd/containerd-0.2.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=6
+EGO_PN="github.com/docker/${PN}"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit golang-vcs
+else
+	MY_PV="${PV/_/-}"
+	EGIT_COMMIT="v${MY_PV}"
+	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+	inherit golang-vcs-snapshot
+fi
+
+DESCRIPTION="A daemon to control runC"
+HOMEPAGE="https://containerd.tools"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="+seccomp"
+
+DEPEND=""
+RDEPEND="app-emulation/runc
+	seccomp? ( sys-libs/libseccomp )"
+
+S=${WORKDIR}/${P}/src/${EGO_PN}
+
+src_prepare() {
+	eapply_user
+}
+
+src_compile() {
+	local options=( $(usex seccomp "seccomp") )
+	export GOPATH="${WORKDIR}/${P}" # ${PWD}/vendor
+	LDFLAGS= emake GIT_COMMIT="$EGIT_COMMIT" BUILDTAGS="${options[@]}"
+}
+
+src_install() {
+	dobin bin/containerd* bin/ctr
+}
diff --git a/app-emulation/containerd/containerd-9999.ebuild b/app-emulation/containerd/containerd-9999.ebuild
new file mode 100644
index 000000000000..c840962b287c
--- /dev/null
+++ b/app-emulation/containerd/containerd-9999.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=6
+EGO_PN="github.com/docker/${PN}"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit golang-vcs
+else
+	MY_PV="${PV/_/-}"
+	EGIT_COMMIT="v${MY_PV}"
+	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+	inherit golang-vcs-snapshot
+fi
+
+DESCRIPTION="A daemon to control runC"
+HOMEPAGE="https://containerd.tools"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="+seccomp"
+
+DEPEND=""
+RDEPEND="app-emulation/runc
+	seccomp? ( sys-libs/libseccomp )"
+
+S=${WORKDIR}/${P}/src/${EGO_PN}
+
+src_prepare() {
+	eapply_user
+}
+
+src_compile() {
+	local options=( $(usex seccomp "seccomp") )
+	export GOPATH="${WORKDIR}/${P}" # ${PWD}/vendor
+	LDFLAGS= emake GIT_COMMIT="$EGIT_COMMIT" BUILDTAGS="${options[@]}"
+}
+
+src_install() {
+	dobin bin/containerd* bin/ctr
+}
diff --git a/app-emulation/containerd/metadata.xml b/app-emulation/containerd/metadata.xml
new file mode 100644
index 000000000000..95132700bf73
--- /dev/null
+++ b/app-emulation/containerd/metadata.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<longdescription>
+		Containerd is a daemon with an API and a command line client, to manage
+		containers on one machine. It uses runC to run containers according to
+		the OCI specification. Containerd has advanced features such as seccomp
+		and user namespace support as well as checkpoint and restore for cloning
+		and live migration of containers.
+	</longdescription>
+	<maintainer type="person">
+		<email>admwiggin@gmail.com</email>
+		<name>Tianon</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>xarthisius@gentoo.org</email>
+		<name>Kacper Kowalik</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">docker/containerd</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-emulation/rkt/Manifest b/app-emulation/rkt/Manifest
index ff6fa23ba5d2..c9d72b5a1fae 100644
--- a/app-emulation/rkt/Manifest
+++ b/app-emulation/rkt/Manifest
@@ -2,6 +2,7 @@ DIST kvmtool-3c8aec9e2b5066412390559629dabeb7816ee8f2.tar.gz 241486 SHA256 a3e65
 DIST linux-4.3.1.tar.xz 86900452 SHA256 11faaff6e7546038b868f524cdf42a5a1b67be9fdfd37d931723a8deb1811b72 SHA512 640db1a15db2e18f912e8ea93b01c784740d1a9957dc1d5580809448adb0713edfb02b7172f61362f0f362800c88f09dcc8165005250a757fbd942b59e36ba16 WHIRLPOOL f5de4ea768ad7a5cad21705c24b79773522207ffbc85209676b1a4ce067e031330ded68e2201953c477c3dae743f95521da230194be90be900afa30f39f943c5
 DIST rkt-1.1.0.tar.gz 2426666 SHA256 df93dffc1deff470a5bebaa2610a07df8f48e69f660c81de0a31de13d7f7bfa5 SHA512 ef444843f411cd2d1fcd02f606bf5d0971eb314d708d1d54d07af9e3d69e1d74a7812456fd7cc46372ca6e42cfd5ac6af6b7b67e22890396f58d8982c0af1373 WHIRLPOOL 0579f5efd28d473ab4a0874d7218268a2a1143118b9f3e39670a683f05c7fb3b1b952aee75f0c923d76bc457c4d933c3c9b329f99960fa0a95cde2573225288b
 DIST rkt-1.3.0.tar.gz 2450145 SHA256 0468c5b1079da8df65db9ebd0b712f64509acf6c8d6b34b780b6e787271d9b30 SHA512 f00500ddc1af85bc5ebe23b1a28e517e5f321f8c4c2434b71931b326cca5d4a10af4d54648a22634dc5039c7ca305539736b88a63b16fed1be897af0e22b64aa WHIRLPOOL 3f6c7ee950637ee16373ea43a23b1189c097d771748624be8a5794c734b0cb44b1b249cd424bcddf0ef5ec1761e08b8d53de71b5375ae35a9aa2ca7c3d4b91d6
+DIST rkt-1.4.0.tar.gz 2506968 SHA256 1ce98ff74aef3dc2c43025f2b458e6dbfeb6c7f756a313f4ecc2827fc84ce031 SHA512 3e97ddf0d2c1c892d1df6a82e4db7bdf1520a474e4aa56020a4c3c8b6bb81d1a2378baff0d002436ceed4dfb8a2a0faa502b12d5924df435e7d869f2c30901f9 WHIRLPOOL 2f45f2b50de046903c37318b725e2c6ff269c968eaa08370b8d74e63d42c00dece5354ca9e7c94fdd8180841f89116d760eee92886ed34ec65d2e3383d08c86f
 DIST rkt-pxe-794.1.0.img 185121072 SHA256 d513e27d2412d8fdaa2456786703346f10c24a62480d2036ca5c31b3d5a0df16 SHA512 f36324e9736bb0c533706c45d4146bed2efcb3ee2cb842c3624a62399835808c0df2aef56495a12b30f67c47fd84e93e34b10c57e4aa6d0450402d5e21c6f88c WHIRLPOOL 099851022b11aa29d004bbcef316a7cceeb5efa43f8069cdf1858888e7550f938fd9f9ec53eb63c313b5c1b93b0569f578a50fc5bae28b4d30c451a2ffd2adba
 DIST rkt-pxe-991.0.0.img 226115454 SHA256 33697d3d7c7458bbb160a5eb889ced34b001c35e22e10c86235042eb57ae51ed SHA512 1b785d8454381d47eb53062433bda5645650420b58821ac00119a92032ba4d669c974871eafe7e414ad349952974cfdf6812f85af69d3286b7bfe2fc2d04c52f WHIRLPOOL d9f103a0c5a78c8a4403a17e805872703cd5d4fe34e5395c381216538a15f58a7678c7d744ac8aa90ed4dd850a614ca52487cb50e5687c812488a3cdbdff2de0
 DIST systemd-222.tar.gz 4015599 SHA256 b49f51f9855127987adc98aad3b6d608e4e53eaa029b629f2ea2089ce0234f34 SHA512 83f0acf0ca90c89c902c268af6eef4b61380a30380013cbe89c929357959f51682cd3961a6a4f772abc09d5ca09404ae290edf2c3253fab1b20dc2b5b3ecde47 WHIRLPOOL dd0151034de374b072e70448e7a9ff47693df0190e8a2a11488593400d3d7e53e0a91d86037d027c750584089e6c68e58c437647d608a72f8826f091e3253879
diff --git a/app-emulation/rkt/rkt-1.4.0.ebuild b/app-emulation/rkt/rkt-1.4.0.ebuild
new file mode 100644
index 000000000000..8074ce104b01
--- /dev/null
+++ b/app-emulation/rkt/rkt-1.4.0.ebuild
@@ -0,0 +1,189 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=yes
+AUTOTOOLS_IN_SOURCE_BUILD=yes
+
+inherit autotools-utils flag-o-matic systemd toolchain-funcs
+
+KEYWORDS="~amd64"
+
+PXE_VERSION="991.0.0"
+PXE_SYSTEMD_VERSION="v225"
+KVM_LINUX_VERSION="4.3.1"
+KVMTOOL_VERSION="3c8aec9e2b5066412390559629dabeb7816ee8f2"
+PXE_URI="http://alpha.release.core-os.net/amd64-usr/${PXE_VERSION}/coreos_production_pxe_image.cpio.gz"
+PXE_FILE="${PN}-pxe-${PXE_VERSION}.img"
+
+SRC_URI="https://github.com/coreos/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+rkt_stage1_coreos? ( $PXE_URI -> $PXE_FILE )
+rkt_stage1_kvm? (
+	https://kernel.googlesource.com/pub/scm/linux/kernel/git/will/kvmtool/+archive/${KVMTOOL_VERSION}.tar.gz -> kvmtool-${KVMTOOL_VERSION}.tar.gz
+	mirror://kernel/linux/kernel/v4.x/linux-${KVM_LINUX_VERSION}.tar.xz
+	${PXE_URI} -> ${PXE_FILE}
+)
+rkt_stage1_src? ( https://github.com/systemd/systemd/archive/${PXE_SYSTEMD_VERSION}.tar.gz -> systemd-${PXE_SYSTEMD_VERSION#v}.tar.gz )"
+
+DESCRIPTION="A CLI for running app containers, and an implementation of the App
+Container Spec."
+HOMEPAGE="https://github.com/coreos/rkt"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="doc examples +rkt_stage1_coreos +rkt_stage1_fly rkt_stage1_host rkt_stage1_kvm rkt_stage1_src +actool systemd"
+REQUIRED_USE="|| ( rkt_stage1_coreos rkt_stage1_fly rkt_stage1_host rkt_stage1_kvm rkt_stage1_src ) rkt_stage1_host? ( systemd )"
+
+DEPEND=">=dev-lang/go-1.5
+	app-arch/cpio
+	app-crypt/trousers
+	sys-fs/squashfs-tools
+	dev-perl/Capture-Tiny"
+
+RDEPEND="!app-emulation/rocket
+	rkt_stage1_host? ( systemd? (
+		>=sys-apps/systemd-222
+		app-shells/bash:0
+	) )"
+
+BUILDDIR="build-${P}"
+STAGE1_DEFAULT_LOCATION="/usr/share/rkt/stage1.aci"
+
+src_unpack() {
+	local x
+	for x in ${A}; do
+		case ${x} in
+			*.img|linux-*) continue ;;
+			kvmtool-*)
+				mkdir kvmtool || die
+				pushd kvmtool >/dev/null || die
+				unpack ${x}
+				popd >/dev/null || die
+				;;
+			*)
+				unpack ${x}
+		esac
+	done
+}
+
+src_prepare() {
+	# disable git fetch of systemd
+	sed -e 's~^include makelib/git.mk$~'\
+'ifneq ($(wildcard $(RKT_STAGE1_SYSTEMD_SRC)),)\n\n'\
+'get_systemd_sources: | $(UFS_SYSTEMDDIR)\n'\
+'\tmv "$(RKT_STAGE1_SYSTEMD_SRC)" "$(UFS_SYSTEMD_SRCDIR)"\n\n'\
+'$(UFS_SYSTEMD_CONFIGURE): get_systemd_sources\n\n'\
+'else ifneq ($(wildcard $(UFS_SYSTEMD_SRCDIR)),)\n\n'\
+'else\n'\
+'\t\0\n'\
+'endif~' -i stage1/usr_from_src/usr_from_src.mk || die
+
+	# disable git fetch of kvmtool
+	sed -e 's~^include makelib/git.mk$~'\
+'ifneq ($(wildcard $(shell echo "$${WORKDIR}/kvmtool")),)\n\n'\
+'$(call forward-vars, get_lkvm_sources, LKVM_SRCDIR)\n'\
+'get_lkvm_sources: | $(LKVM_TMPDIR)\n'\
+'\tmv "$${WORKDIR}/kvmtool" "$(LKVM_SRCDIR)"\n\n'\
+'$(LKVM_PATCH_STAMP): get_lkvm_sources\n\n'\
+'else ifneq ($(wildcard $(LKVM_SRCDIR)),)\n\n'\
+'else\n'\
+'\t\0\n'\
+'endif~' -i stage1/usr_from_kvm/lkvm.mk || die
+
+	# disable fetch of kernel sources
+	sed -e 's|wget .*|ln -s "$${DISTDIR}/linux-'${KVM_LINUX_VERSION}'.tar.xz" "$@"|' \
+		-i stage1/usr_from_kvm/kernel.mk || die
+
+	if use rkt_stage1_host; then
+		# Make systemdUnitsPath consistent with host
+		sed -e 's|\(systemdUnitsPath := \).*|\1"'$(systemd_get_systemunitdir)'"|' \
+			-i stage1/init/init.go || die
+	fi
+
+	autotools-utils_src_prepare
+}
+
+src_configure() {
+	local flavors myeconfargs=(
+		--with-stage1-default-images-directory="/usr/share/rkt"
+		--with-stage1-default-location="${STAGE1_DEFAULT_LOCATION}"
+	)
+
+	# enable flavors (first is default)
+	use rkt_stage1_host && flavors+=",host"
+	use rkt_stage1_src && flavors+=",src"
+	use rkt_stage1_coreos && flavors+=",coreos"
+	use rkt_stage1_fly && flavors+=",fly"
+	use rkt_stage1_kvm && flavors+=",kvm"
+	myeconfargs+=( --with-stage1-flavors="${flavors#,}" )
+
+	if use rkt_stage1_src; then
+		myeconfargs+=(
+			--with-stage1-systemd-version=${PXE_SYSTEMD_VERSION}
+			--with-stage1-systemd-src="${WORKDIR}/systemd-${PXE_SYSTEMD_VERSION#v}"
+		)
+	fi
+
+	if use rkt_stage1_coreos || use rkt_stage1_kvm; then
+		myeconfargs+=(
+			--with-coreos-local-pxe-image-path="${DISTDIR}/${PXE_FILE}"
+			--with-coreos-local-pxe-image-systemd-version="${PXE_SYSTEMD_VERSION}"
+		)
+	fi
+
+	# Go's 6l linker does not support PIE, disable so cgo binaries
+	# which use 6l+gcc for linking can be built correctly.
+	if gcc-specs-pie; then
+		append-ldflags -nopie
+	fi
+
+	export CC=$(tc-getCC)
+	export CGO_ENABLED=1
+	export CGO_CFLAGS="${CFLAGS}"
+	export CGO_CPPFLAGS="${CPPFLAGS}"
+	export CGO_CXXFLAGS="${CXXFLAGS}"
+	export CGO_LDFLAGS="${LDFLAGS}"
+	export BUILDDIR
+
+	autotools-utils_src_configure
+}
+
+src_compile() {
+	local arch=${ARCH}
+	case ${arch} in
+		amd64) arch=x86_64;;
+	esac
+	ARCH=${arch} autotools-utils_src_compile
+}
+
+src_install() {
+	dodoc README.md
+	use doc && dodoc -r Documentation
+	use examples && dodoc -r examples
+	use actool && dobin "${S}/${BUILDDIR}/bin/actool"
+
+	dobin "${S}/${BUILDDIR}/bin/rkt"
+
+	insinto /usr/share/rkt
+	doins "${S}/${BUILDDIR}/bin/"*.aci
+
+	# create symlink for default stage1 image path
+	if use rkt_stage1_host; then
+		dosym stage1-host.aci "${STAGE1_DEFAULT_LOCATION}"
+	elif use rkt_stage1_src; then
+		dosym stage1-src.aci "${STAGE1_DEFAULT_LOCATION}"
+	elif use rkt_stage1_coreos; then
+		dosym stage1-coreos.aci "${STAGE1_DEFAULT_LOCATION}"
+	elif use rkt_stage1_fly; then
+		dosym stage1-fly.aci "${STAGE1_DEFAULT_LOCATION}"
+	elif use rkt_stage1_kvm; then
+		dosym stage1-kvm.aci "${STAGE1_DEFAULT_LOCATION}"
+	fi
+
+	systemd_dounit "${S}"/dist/init/systemd/${PN}-gc.service
+	systemd_dounit "${S}"/dist/init/systemd/${PN}-gc.timer
+	systemd_dounit "${S}"/dist/init/systemd/${PN}-metadata.service
+	systemd_dounit "${S}"/dist/init/systemd/${PN}-metadata.socket
+}
diff --git a/app-office/libreoffice-l10n/Manifest b/app-office/libreoffice-l10n/Manifest
index edff170cecdf..18e26dbd6ae0 100644
--- a/app-office/libreoffice-l10n/Manifest
+++ b/app-office/libreoffice-l10n/Manifest
@@ -166,174 +166,6 @@ DIST LibreOffice_5.0.5.2_Linux_x86_rpm_langpack_xh.tar.gz 502351 SHA256 093a5272
 DIST LibreOffice_5.0.5.2_Linux_x86_rpm_langpack_zh-CN.tar.gz 571770 SHA256 758d94130b5f13d8dfb17546c249c2342b2df4afc2177c03d66ac3a04c702c4c SHA512 ad1fa0519621a62a53f673da2c1b1fb4be385aad6724b363fba26c6fbe92964c3cfde5e193677279f3e7ff7d847ddddf97c2c9433c37636c927431e72ac9deef WHIRLPOOL e03c9fb3cdcfd3b82696d8009dcb5157489cceca84df1c310b345fd2d4f69e27e9848b03655fd0055066bdf4ffcb17cf7cdaf21c0f0fdbd921cf12840ba8b012
 DIST LibreOffice_5.0.5.2_Linux_x86_rpm_langpack_zh-TW.tar.gz 569096 SHA256 2a3fae756c5317b432eb15fe6315c0157bf3c7ae92aa81909bb86f673b86645c SHA512 fa567788ada4e09685ae8ed705b7a72bd311e54e33ecfac6bbb7f34b385c6cac51e3e620accc4a358a2e0a8b9481e251be7d0a0c143384e569bd984846e680ed WHIRLPOOL da781a4f78436b5bc0bc377eb67d12780eda3ad66561dc1680c5319d64c723880e0e85bd46ba65c700ad2733818c59c7dfe63aa82f62066f6557bc6eb967f48f
 DIST LibreOffice_5.0.5.2_Linux_x86_rpm_langpack_zu.tar.gz 503477 SHA256 5c1ae218ffdbc87d0853243f47addf6383ed81bd4f4cb3da91aac62e73a0d76b SHA512 ddd230db46f086ef134ddeb71316a9cb7b4db4efc269b2da678340a5b19c355a02522f7ae4375844fa23c168e4548b8f0a9c052fbd22d94db923ba5331253438 WHIRLPOOL a3c4c3a4019bda892f6429ba6c9e20b6d20d01a1b41eadbe6793fd0f95c1af5765d67dd63a898249a66a0614eb6246f017addc0c6b7ece1194ab260c5d684559
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_am.tar.gz 7607867 SHA256 125121749eb496a2311ba33e7cb5235d0cb84fe66b6d5b830039543321941036 SHA512 9bd9f7f1e2f690415f38666c53086c091580cb6132aef315276b73c80ec26146c8cc77902bc5aa0da9e50659916f93cb5f26408b7bd2afead060bcc42b202b08 WHIRLPOOL 6c9a70515e5ade56d8bdd4e8b7d05ea50fd33b8465ecb418f40a2cba51be5e9a3ba2ab8fc84631f8ecbb64056b9003b110ebad1135374433597a1b7baa5e252c
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_ast.tar.gz 8093321 SHA256 d54b19fdfd05a4375fd3603e089d6c411a98e3049740a6d2055ec389c96b8335 SHA512 c3a90f8bc52cdb53bb23d2760f1fcaa486f29bad558aba72cd439ea8ef10f9d835eefba6b9ff58017ad777bd5131748bed8c17721f73a906deec34d42f32b95a WHIRLPOOL a1204639e6f3d7ff4282db4d7929a864cb158dff80b31a1c333603a514bcfca7c881afed7a8d0a9eafca6360f989172888a6125aa11fea0aac4df2a0e70489f4
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_bg.tar.gz 8326106 SHA256 73a12f347da989e7cf46c54fe8eb53630d8b7311f3fbaf111715c30a0f080e72 SHA512 7bb5d98b1af8e2a96fb2fa9d2bdd996bf4a74c50b740ef0d5454a0bbbdf21a1af888193d8c0431710b7e11c62fcef71647fe002b529f3ea6c1bf0bee901039c1 WHIRLPOOL 91c558a4ede5c60e1be02d4925ada0bff1f9548ffb8aba544029850ddce5ecb194f629c70df96dad6ced5b58f7b54730041fa653233b13cebc7d6de6182819db
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_bn-IN.tar.gz 9832234 SHA256 2ab8b5d8c5e6cb61f2fb949d181ab06f5b6aa7d0a5edb33601952fe5ccc8bcb2 SHA512 f926d73e1c984c50d2e77e20d8c3849e8e101246bcefb69d079031565e60d43fd0561fc3b1620d81442d421af531300ceaf0834897067a6713e9ea69ec6ac846 WHIRLPOOL 652e0f4e8c484e78715d720165b98c368e4a31586534271d0f5c336d0cc9ab1b303adb3e705be75f9a4610fedea38a8d1629d7d2102c870f60c74c18ceffc70c
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_bn.tar.gz 9832584 SHA256 31bb5d697729bf7c1b06601f800d17c018fea40571b6e179d00decc2ee335817 SHA512 845e885b469fe49cb35219eba37860cb1323ea794cd1fef5bdb8db2c667255520d24a2ff9904bd1bd1f16f096c801e02e2d371d73fce9e507a591c7caf1b5c26 WHIRLPOOL 13a0fa5c5eb947e3fee94e6893273840d0cdb70808075d5e4186e180c9b9051b3cefa8c805d585828bc02e40173ca7312da0e88feafbf5dcbf4211c9c2645144
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_bo.tar.gz 9494664 SHA256 21a56d05e4cc75b74f51c576fa7803bdb9912d6b039bd47f7f554369f2d0380b SHA512 c03cccc8c6bc10259dd4ca5187884a63a2747c504ed0cc532b937faa268ca44f1bdcc74a880b86c5df127d5b539f6f7da6608133e6aac7253767eeedca81414e WHIRLPOOL ddc861f2e4a272e0e95b355c08ac671bb045cbb7d0a0873d2c178a0b06ef6e9a351f137b75559a5572c5cfc0c9b16dd5ab31886ea25748f958bec19250af9622
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_bs.tar.gz 7132765 SHA256 625ceb3d265bd5b461748bd8f4ba835d30a497d2c75a784c85e7e00bb6869731 SHA512 062672babaf1de1e89e57df89cf8956488cec880f31c63a86bcdc6b60e173e8fb096623103ce43e15fd9a36cfb1060851a1699ddf0c66d1b3e3932f9498c4ffd WHIRLPOOL fe786186e58c5ce9aa9edfdbfadb62e93d88243ff6655bf8c6bec7aff2ad8f6ade91046a9a10ee4df02928daa195a0fca08055c650fe6bcfb5d9d0885511467b
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_ca-valencia.tar.gz 7965699 SHA256 fe587fde1e3d14f9bf0eba2f36b68af7156281fbdfe0382178ba1547ed787ea6 SHA512 79b88b5d65694198645b7f2577288fa732b603bd7af2bc187f60570796004b6ce1747b7d0e8cf7d06abac78209012e222423b86779e0d5f74905827344520ebf WHIRLPOOL a8bda959b6bb4674bf4313d7a055d707a31d14569d4749e36dbbd011eda0786ac59e12bc8d8d869e2f3b7ffbbab1f4703d0612c873dfd12f1ff4403c214e1987
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_ca.tar.gz 7953432 SHA256 eefa700b5088a02c873dddd81292b970e8014a8466a2f96d07f6ee700d0d8195 SHA512 5189b5269f1795694f1bc55fd1f997d7b6c5bf7e7f513bad82f0ac16dc0748af7156788af6e31007a599d8867860b4e4368389bdc82a6f24e9062a46798b65e4 WHIRLPOOL d64bd2e3df4e3717dba82d6d0ff530cd0b09c4950079daf6c656cd955f4ab3ca4fb3c5b10ffd74632570497619e9057dc4cfd8a51ef1f8f8414c9bf6b6c5c654
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_cs.tar.gz 7583110 SHA256 fec1b70012c11aa07edd824a8448504c47a92341f4d6f62f7ae9fe56eea6fdd8 SHA512 cac380e296c0a7ccd5d68af598a08026bbc95b002113a3aef5fed7ec9473cc650a3a072c8a2e064a320e7b0cdd59a30f168986f7f02fd04c9ac3e304f4b64541 WHIRLPOOL 94cc498fbab2b550d1a894cb12c465c1db5dacc012d159ea954ef7cfbef0970a64bc898bf0c45d1b4db588ad9402ec7681cac93ed6d942ae644be35c54b2ca5a
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_da.tar.gz 7585638 SHA256 986e344d6f9b8b51a8bd93d44dc854508fb5946bb27ce213bfcc489df3cbdb1c SHA512 c169a847067ec307a3a1b7fc9015079754983d5fd38f41845f831143462c6fd838340e0980177c17e83c54aad063d522c259b8cd5fd3cf693e1e7e7ab10d2c4e WHIRLPOOL 839e68befaebbc9c88ca122464f0a9a631a1b21d02671d2d0046ad67a614e0a388461e635181ee72f413f128ab6c250fafd194669301eaf168caefcc51fceea9
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_de.tar.gz 8143595 SHA256 1601c98b948d43e65db54b3a262155e39d3d72bdbb0556cd9658594f8207a245 SHA512 0dbf7c11fb722d167de124fe34b9432c99972eb919e03bb8663fd582bb54c566db9d3e0f113770906e1bf1ea6277dc0fb5c68392096f35a6a700b511ecfce9f5 WHIRLPOOL 45f66ed4b804cc20b4bea495dba96b5bc1e6006a908920b88919c3bd7b62196e9d38ffbcce1cf741dfd20a6527924ab6f084617f2f3deba37e31019b10802a91
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_dz.tar.gz 10386387 SHA256 fa8a03664b0d59cd85698d24bf48cc50e780b6de4d9644058cc98180c0de4798 SHA512 050e8a16dc9889da6dd5a8ac27741f166e08642776ee9fd2c6b3926ff627a64383caebef5a6129137eb6ca459766c751367debca7e93220e1bfee56d8d0dfd55 WHIRLPOOL defce13491ab39ba3e1f2c97d46c2b59d822afe94e21594d4d4313346814e6e54e4b9f0767d1baf47b5233024967a2bf74ec0170c71153122ce57b5fbda417c3
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_el.tar.gz 8975332 SHA256 180e8d9b63c3cc4470714fc22c9fcf9bb2d4851855478cf78b5be81db7adf152 SHA512 d50e149233fe2525481e67046e704eaa61af7a81969f7d4799ec963ed42f4c1497e4830b8eafdb32ff79dd9ed7b0392da888055534275d7fe3729f058db37a2e WHIRLPOOL d655cd8add1bc8e938d561496b31393b3ec101db60b47de8f88cb3d16864475656b33555a3a5f95f671a84ec9afaade18bf39cc2950188da882fd6469c3a1a12
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_en-GB.tar.gz 6443077 SHA256 c8455ce396f6796bf9db1c2c58a25aa795cc289afb553a13e80bd2f0d9652685 SHA512 c5877c3086933e1acfc5431c9aa1d6700b4e7435023518905a228cdd3c4d01bf685d37d5dd9c520fbc4c5541eb15f074d02af37f1d3aced59f2c26d960911bf7 WHIRLPOOL 253d7d1bb12534ab94aaf1732f27a95e0a3f7018a6df226335370420f86cdc3ad3043c6074e6658bb341c4ec8d32e935e5cf888f45e0bff83959164d1558e4d2
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_en-US.tar.gz 6487145 SHA256 edb6122e2fba4a2ee936c5f3e8a36f656791e27232fec2406b9da318dc3f03f4 SHA512 7b034701fc963f32c60e3abf110da310e5bb7dfccfbe3d74b1ca1cfd5f6d1a5c99dccb29fcde22d1c9d9d1de248e675c8424783a3239e57e264ea32d282a1307 WHIRLPOOL 0f48988f278bd32595057142ad92b9057ad9af4fd63dce7c2a374a0aa86d41d9f8642b8124d5e91ec9460aa00e6b952f05cdb2f285bce911159acc0c0ceb37c1
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_en-ZA.tar.gz 6432513 SHA256 ef78d7e7d67e445855cc2fe42d374a989ab0aac995babfa14db87c509b0467c2 SHA512 1596ab9bc496d24b42856728c51697e29b4f223f2ef79ac29c561ac66cf1990981560597833a50b30df92b29bd8b92911f56ff2df636b2ef1463cd512db2129a WHIRLPOOL 614b0c666a9d6de399b0b907c72f16cedcfce6428d5ad61cb262406a8d0fccb8cce4f1af8547be26685c4e6baed4fc76f586fe3efe65176a302e4a65881393db
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_eo.tar.gz 7014360 SHA256 ab00bb010ed020b811a863c85c886c2048564b125e128f371e678b8436598b1b SHA512 69f87b25cfdf9467299300545f45260b6eece8005f40d7932845924b19bc0c608fa391e8cfd39d35eb4c8db73eb66782d7ee30f3ea74c7fae44cd1ffdefa7894 WHIRLPOOL 64b05da37a9adccaccaaee6d2b0b149fa7d5bdd1f2f25a6dcd6fab04cc9c4e910c116831d3ecb209116b03deb9233e41468f21c154cc1c6802beacf2f25323f1
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_es.tar.gz 7998096 SHA256 863e5b2d9eeb96648a0f51ad58593c0a3f1a36afd437338481d973bf4cb1a62c SHA512 05c074a580d0f1720cbfcf09153732a6d4a31702d9643e98b4b283fa75a5c540aad7b39c6d86b42cd63fb9868d7c07388a7db2b118a7035d8da0c89b797a907d WHIRLPOOL 2a109f6c0609177455265d17e58d088da8fd051a75534dab02439210d1e2eb8ff96fde1d7e385d4844273b79cee3e8f3ca2b191ca9fa9a592695c09ad5be77b2
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_et.tar.gz 7514720 SHA256 2d2892192da0c843e124a8e99fa8d7dc39c92e13c15e50dc0d91672a2865461e SHA512 dce7db9d41006f243a384eac1f0b6663e9304d064ffdcd8c93782f6193a04f5c68f8bbfde3bd4fe32d5e83a7ce760e2a12d13b90c929a343270dd183f06409ed WHIRLPOOL b6291bce316dc9728e3de8c2de4c98f5e2f03785bdac38bafa28dc19ec65602353203243156fd2f15f77b17d0b8b537dae77c9cf44983a95a8e2a361e76bb13a
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_eu.tar.gz 7658863 SHA256 ec97e110c44abc3faede1d1efe71c549f65e59a118da601777a83627b855ac89 SHA512 9b5ce375d2ddf261858cebd9d92c9bee4f0ee7c7d6ff0df2bba843f2e9f486e2e757d22a296fe8244e74c58247c7bb5bbaaacf9afae640b335abeb0e70a4787a WHIRLPOOL 5c804477489d4071ff1f4259cf4d1269ec25d92bbc74c8fc34a70f570dd6fafa47725ce4945799724deeaed5caec265e2f11f72ee75063b05e823a4201371600
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_fi.tar.gz 7796724 SHA256 a370ef15288a3bd094e85ecaedeae09657551b3a0e03be8fe3a88e4b1dc46366 SHA512 7969c1faefdf78744cb38359e4ad92c7d0face00db80c74eeef0defe5a1e35a9c1fdab47154a4f1e3304f800ac2f9f427f8ef1ec2f4b53ff06f74a7bbdbd743e WHIRLPOOL d881c3bc063b81264aeb33c5bc4a26860fdb3f8b982c06b4236ca264d01b5ee4615fe4207c4b4b7fce331a74077c25b1ea86214e6f600bbdf53dc1a0d9f72b97
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_fr.tar.gz 8182528 SHA256 5dd4e9909dc6b05a10554af6999651e980b18160fd287e98f87bc040504d8e8d SHA512 2ee299530a072e43b49e40f83a1ddced132d3e341c8181573abf487d367d8dffda39bf026fa09c3bfe19f479f93f27a8527ced5c5c2a29d85475777a0b16b15e WHIRLPOOL 4227abc7c70039219851c3596cdd890a2b146fdbe80f00d5de056bc2f404358d4cba6bf7fc136ac0ffec3b2ca84f5e7b9b947aca26a2f4b1ecb8442041b4acc5
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_gl.tar.gz 7733160 SHA256 f603b1e597a380548a71ae1a01259e244479913bc70ae0b5c831df507738cce1 SHA512 f8d236b967cdfb92e0e23488094996bb775fadee1e3418eded99ce63ef72e7c05da9f9be0665c1c2f276344296fedebfb07caa78f2e819e8bcaa14eee019c7b8 WHIRLPOOL 7e906c56082cc11ca97157210ea2089fc57c41d3b4da47806a84a7bd6a9ead5f93185bab019896776190eb16633b3dd91292517fd2c94ce0e7a50c7fcb4425d2
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_gu.tar.gz 6654863 SHA256 7153c816db7e43f858258ef7d83681ccf16c0e4786dc58116e2c2a73cc60cef2 SHA512 4be092bbc8bf4481a69248687a20870e4ba632f061c50e8763c5ef1e1e81a530055457535f81107b49628eafe0595c68482be10fd7dfd7c1343fa1d94eac52f1 WHIRLPOOL 95b6ff163eea8a201157b287640a1d38ae2552a792855e59c59fb6ab4d671020fd2cacd39efdae56e8cad5bb4bf43a59f3eb0033895e76ab5a3d74caa675c992
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_he.tar.gz 6270536 SHA256 1b72aaf46277fd169b83df703f49d8fccb4089b28b6a915e9c80d5300d79a388 SHA512 c2d6b4dec7955c431dac0594409652b3ecac8f59440b7c0446e71e10af90c4398dc081796e089cab8a908d1473b86403405cc9ccc10d5df6895c477576fe6418 WHIRLPOOL 5a280e9a7ca4fd80ab24af57867f17c46f29619e1c88ecedf6920e471ac5eb92527d3493319bc9f898638e5b4a12503ce0f16270dc2919c3725ba3d169fcad18
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_hi.tar.gz 7334900 SHA256 9b2d9d3ae05d06fc0dc4edb3741b346eb750f51c35a6198da8397c3a90186166 SHA512 0e4666d70599d0bab4b34044120260f13e300412f7a925b35fc4fc2ae7185dcca57a401aa4c74e84df522fb48e4acb66aa14d7fcc49d2ed72a073910085b0911 WHIRLPOOL 132defb8782b0393bdfa7e7917b104877c360c85db81b34bb2092fabc995f4198fee5b7da9e6f367dd82fa116d687d6ebe8262cf4e09d2b90178d65dbbbc6e18
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_hr.tar.gz 6818979 SHA256 ffc062b67d98069ca63c208632ae44f844e98180d2e211ba21d321bf97cd0e12 SHA512 5a60a28c163a275ebd80f6cbcfff6910a6babf9a6aaf5e4af7d9b0d0f27bf93721dc70a5a910a4ddfa66f83415ed9b4337ad941b0f992a298d5005772575c6bc WHIRLPOOL 7ac786140b0375e3d2b3cb8b61613af68393d055510187fdc00a71efe263ac7b9740aa3d0a6ffa66d92016f8d6fcfd4e33148b5468c74f176aa92af2cf061aa4
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_hu.tar.gz 8010379 SHA256 7f0498ef23702874b35f1e55a9c6e4f42be41afb787447b3d943c5b73ecb4793 SHA512 248fffc4bb890089dc843e62716801010b8406055d68b8405b014790c37ab7dbe5308f82bb7836bbfee22668bb094e1fe33f830d0d9efd33825e24d274d5278b WHIRLPOOL d59249b7d9f0d9eacb8b76471b88b86154e7a0743d5f21e43e18d39bd448ceef39a7dfe837724e3514a05010a4633198def9b6ab2fd9e2a94baed84065ce1d37
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_id.tar.gz 6814747 SHA256 6d0946a6f78d3478dfe69e1981e306eb055d4e24b11af59d2b512adc52dbf2aa SHA512 771ab909e2abb38466f34874bca77a7789b011ed3251d90583ba76e85723ce2dc046348fe56aeb35868e0dacab5501f1503aa293748ea8016980edcbce5eea85 WHIRLPOOL e8120ababd7394cb8b6ed4d702378588133e8fa0497f9ffe8eaa922b87e4af06ccd0fafd95904201f1d04a9ace3e3b1f263e6e21fdf3990fac9cbf3ce7b1dfc0
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_is.tar.gz 6923495 SHA256 ca0b414025408430efdf82661a04f916915d82347fbda2f58aa2cd6b313f9e60 SHA512 273f2240163f4437a11e8202d1770f3dbbf00f10329eeef9efead92d6d32892c8df0a0412d382cf580d5f2cdddea2030c5e51045cc4bc2f6f7169837d4609523 WHIRLPOOL deb0b09438b5ac804e1b648aa4349a5d7636d5c98acf718fb28c5760b6e1578f49a0f0a3060a38600f6d20580ba0e67c4ebc2f747f98919cf44eaff08570215f
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_it.tar.gz 7938048 SHA256 cd7d56624ba5874e9d873a48faedf6a4757d598ff69a3c5ee587c69948c99b63 SHA512 5a7e139f5eb82de4c9f78b354c6186d7ccb7534c2409cb43cbb2894dc18d48f030a41e5236c775128bef4b91ae1bd5752d8604a0c9e1fdc272c36bbf4930ef97 WHIRLPOOL 70d6ccaf11858b8d0721be32ab69dbef0f2e4fae8521826fd707abbc1999ed5c3067aa37c108bdc48bd689dc41a152fa92a8ddd1f76502553d6c86af2ac8d5e3
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_ja.tar.gz 13446138 SHA256 3daaba0cdf3b5f2946737a05b5b897d339bac663d9c5467742f26649158c6b7d SHA512 45536559159336160e037d606a7031b1c76c0814fed7b6f4f614ceeaea131b2a2c861a1f13fe596003094c35a17afb232958a9bf48e9cd704fef72665f3cd68d WHIRLPOOL 9caa481397e4ee16212861244799f41d0528a7b50dd7d03478979fd7249d69cad2b12de95bacf9e323d8c8d48a48726935811d3bf1a0931c3771302fe459730e
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_ka.tar.gz 7123839 SHA256 ae16bcd872c47e1fd0ffe99e7b0bda0175b00c3c457294b45e6ef0e5464f9bbd SHA512 70608c76d991f42171a2614772536a68116242f985637e4fea902a9fbecd801bc51f60a9b32e6aebd285ac063b600a8250900e4629cb7d63b6381c1e1b6ef688 WHIRLPOOL 97ecbd985f3acbddc7a8a47626385214c13d084b047da31dd88ab79cd992ca84b4a4b039f34e4690c013fda4564c2bf4b6ca212b33e015196abadec0c588125d
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_km.tar.gz 10373625 SHA256 19e38ff260b9c1a39489042475e13c7dd5bc8dfc30f78b79d8da4d8f7ac5eee3 SHA512 c1aee6bf0245c06359ce90b92df3fb9bea206897ae262a327486b61c7ebee7e7a2c39f266e83407b3773c851a1cc379e9cadd0a2593b40579f554f86d5016486 WHIRLPOOL 0d5b60a9927ce86d0d73ac4e20a781167b96e7060fe647c03152631a0272636e5b1f0dfe488ef8f5dba4661540732197107d98373a6752e9096753aecb24a051
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_ko.tar.gz 9380890 SHA256 63bba3ba51673ba683d2728f99c1498ecbecf2966f0e7897fde782379730f2d2 SHA512 6d7fac669b52afb1033509667b369030e43d465bad3c12cba3a96ab0d32676ea1bb3a205ee02832a21e28655e74d201dd1377883ea48572d6be6d291d65cf0c2 WHIRLPOOL b4c15501a602106a6affcc827aa0ae1d805e424f8c87994260aecffdeb34afcffc5fb87f8498ce1805732b9de6d26eb3d8c0f81d542de688888cd9586bc14e18
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_mk.tar.gz 7359144 SHA256 5218dae68122e72da70b1a236420a848f0eaaef9c4a162861d71254278b232ee SHA512 e76f35d0377eb9afac543dfd3df3fdc3389b8d248c09b32cd33b37d3207a7f119e4522561343f387c12afa52963e6abdab3767c9215644c3fbc2886f27e1fb57 WHIRLPOOL df8effa752faaed3b4204cfe050d4afdd2890268b96f59a993756a59e8475f525f397b2b16ce2133769a0abf96182aa723efd619dc711225d2a1853782545104
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_nb.tar.gz 7671657 SHA256 cf4c04220302d6e837db79805424d0ec0e5b10d34324190a1fc69d95427ab9f1 SHA512 892418f81d6c77202cfffdcc935fb4c04d60434f136d75f35e2cc99040d5fdb374b31b3a476e945436e02eaeb8dee22857a7861c376ce53397a4f4246a885a39 WHIRLPOOL 6009bd9516f82c248589f6db03ac32b78b1fd03ab70c1c1852229925ba0c6e2fa1798cb4b96e7e04cf66ea77baee9c4af152c8a97c93e0c74f5a819ce7943ea5
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_ne.tar.gz 9859732 SHA256 292882efbc40e117b411ca33406f171594a840bd9ba70a43de4d3535bae8ad61 SHA512 428232843cdb19fa09fc5be0f2ad077f06e20bc2ca4577ea32c6d21303e4e232be4085713ecafdb67d240259ac50b77183a6cda587ae363929eb424e5874ade8 WHIRLPOOL be80c24ebc0fe9ca1ea3d20af81851011fa5bf817d6ef77f0bfa4ac4b18dc4adf4c33a09b3817e22bd42f39d5c09531e27e00fd65a3a1c158e24009aa15bbc9e
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_nl.tar.gz 7753046 SHA256 68dec80d9ef18f03c770a34a4856bb3b2acea9d69c8f10826b237f414b8fed32 SHA512 a13f653ef46ec8e1592276e92ffca5d08f30915ad08861c7b79318920387aa3fe365dd5a76313d95d5d7ca731e9a8f435037340bb1e8da0b33bdc166966e6f51 WHIRLPOOL 46a40cd0dd2ee6480672af1685da1ee236cad7e3911e20f5b10e3cabc53a972bec8a078a797d6cd5962856f4958ee30e1cc1d7f6d9781e113e8713a2a34460c3
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_nn.tar.gz 7627791 SHA256 83d1da834a89f13a19de1f77e60e5ef3b67a054e4cdddc707317e48e1d7eeb49 SHA512 0f19117b08ca28ccb9844fb3cf16d825f9645271207066cdca5e67e1714a7b442175696a91fe9a20ae1582101ae5eb2541ce9343bdd8f2ad61270026054f6348 WHIRLPOOL da7d780ac73c01a2cebd76d108533783cc17e9d8b4045ed50f5c28db6e64aa30af9949a8dae99884ab26b816b00bea0210d82911f3ec3555564cf22f973b9eee
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_om.tar.gz 8003660 SHA256 0afebc26bdbfee965655eb115a8eb25d21b9e280a2db672fe12eacda4b37ba34 SHA512 2d879326bcd5400bab5ebc2d81d6f638376f2ba78e2345e3b93a1b29178a9d651a07f0b2561de08de84f5c1657600d0e1b3cbbbecdba478990039689a94bf280 WHIRLPOOL 18f3160b20163d265eec93b3531f28082e682ab668e4ecd519eafc118c03980407add3dbe472a47e3c6404da1b7c1b9c73add7e3c6f81371929b58ad420743c7
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_pl.tar.gz 8047295 SHA256 afb920edeff46c05ec206e123b3306565de788f931180b31f22cb735480648c5 SHA512 56aaaf2f8812342097fc7405fe53dd3fa74b339df210ec76bbc0ff7f4696e104c2cf125c1783d99adc8bfe39bb486899cd273f2ae29e926663c49bed9f4287a1 WHIRLPOOL a999f2da5a228a65fe8881f269819f16d3c71365a08da985ed9d3f3b1b4c6564ca1e7ec45b8452e687bd038c13fbf8405cbaeb028c9daadf79de2eb2a4d753c0
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_pt-BR.tar.gz 7760637 SHA256 137fba73d5f06df9dc6f707891cbe813f61af01e41031992d37e6f39462e6bc3 SHA512 68db118ae0fed81daf02b7004d1cea293baeac6d729607629e5c9e17c2176293f34c104925510f8959187c1489c62a1f4223901a12306467bb5933a014b4c542 WHIRLPOOL c9030b4cb53405ddd7f62afe75d069b815546ca4187e8d050bf50a6fd4dfc841bfb3ee49de4c9be5f0436dc87b1b6dcba3a654cbf923abdceb78152cc51275a8
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_pt.tar.gz 7688731 SHA256 1f40da8692d4e66ba58ce9b3d1e45ee24c5f19746a8b7eb10daef5be646dc320 SHA512 c4a1fe17146b4f2146fd4b8ab0614f4403ae940b5f9c6a275c8107316d34c6eb79da4ecd9d3de7e20376b8f8bce31e445b1cd985e77eec2cd5521ffc7d2e2a27 WHIRLPOOL 8a77ac3d0e95eca77a2d0eec693896867760d3dc86fdc4639cabce02ecad0efa3dbeca72efa33a5a004c203e1029f7a4777ca858937573439e8cf04043f3d9f2
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_ru.tar.gz 8429840 SHA256 d187069df0164012d1810d0e75097785051273dfd0c4e02133624653bf6dd4e7 SHA512 ff3c988dd481a16db1851e3a420e86a16b241e7bd04203a22bab5d47bfac6d8b451b3eab00d68af5cb98d4e9190641c04f3a74558bea4cab369be1a96dfabe0f WHIRLPOOL d916013490e8e9e9eaecbbdb09d82b535a973e344700fdf20d8626513d838558e6cf0fe329186a1708039650ad04c690ea72b1a64838d0613b940a5e8f1b0dbf
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_si.tar.gz 7210936 SHA256 90145e7bb50deaf0fa1fa0ed64564cee7655c1a2047c6c5b0b721fc991409750 SHA512 574060bf2ac77d4e0114e57394ce18ce2bdc16eda7d2e1e51349a11295a0f06682c2092319dc506cae71bd64f3998bdcccd6f2bb731f509ff699469964a3777e WHIRLPOOL 98f6d7495690a877196806b0d834bc43ff7fc234a57c531a110622414085cd8b23f28e0622e41bb25e89cd1842b64b19e53efac1d0e37b85a2b1a4de791545f7
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_sk.tar.gz 7513562 SHA256 879f630eb4dd8efabfa0088ff15208a3af87d7439932c911d6a6177cc44bcee5 SHA512 dc076683012b507eeafb77fc280f2e4416bbae3ff3634666fcab9a466f5c4c0e9154239bf2847545bce4b3625b6a1f8b617c3eec9878cc64d0ef3c4edf10970d WHIRLPOOL 2c458128ea1ec2a78620185d1a9ddd1773a76e69c7d24b9c25a7db6602ea7413e2ee4bbe7626ee026a02a6ce1e174cc2affd1a23cb5122a47963017957bbafd3
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_sl.tar.gz 7756946 SHA256 162cfc84efa02a9ef26122affb56a1c77c63c5d9fffa0f5581011c742ccc4f1c SHA512 d95d78a7a678addf477e098288ff13f55d252569440582dc3d7751d5f6b53f84072362ef80f331730c72ee12fc4e9642705cea9179c801e699ebe6be62aad33b WHIRLPOOL 0fa6227d36af521e5d537e0d896ebd561fd7b2d946b27fbf8ff0280f62136ed34a6f3b2d4e28dc8f7e9e350959e3b2f62f378828714a1bc4b4ec7ed81d47d48b
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_sq.tar.gz 6858816 SHA256 0aa8cf10d15cacb747f7592a01acee9cd2510833dfa516483fe310adcea7cf24 SHA512 42beefd0762e95d3d7b29ae083ba21ffd7ef4c3f07006cf9527392d7a2c0786c44222618d0424a21fe072b7b02297b63f4f99e75612a3c538e5c2e869cf35434 WHIRLPOOL 4a4d11f2f06c5fe6db5324a0bf424a79f00a8cd0ace7ab78a8880a611a65477c9eb4f981616c61c023899c8981b7f7bc0342e341fe5fc3dc8cc941d529923ecb
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_sv.tar.gz 7691732 SHA256 baa2851dc3298fbf28fb3d2d578cfdfd3c51971f646a39a3af79b2bb954414b3 SHA512 4762c9b7e4ef2819dc3f857a242a63e96c50f7355d6e6c499011c799ffa838b5f4abeafe940970e6baefedff1b763ef182c19975d0555244da9758774e9afbfe WHIRLPOOL a76d8917b001a06ca72bd36facd8ff109278a219d02968a96edca722deeea7f593b12a8a392b92f8366d918819607a8636f56ca63bf43e41fb2998dead11b860
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_tg.tar.gz 7193274 SHA256 55ecee864fc207927e1ad9b7694e24987e07ff96c873de2e067ed595cdad4c30 SHA512 f7bb96dd1fb66a616edbc85f0b27ee261dfaaccd6cdee7b3cb87972819fd1068392aaf66409ebd74d588c04c8cf76c318ea3b22776398eb2ac2623edf61fd655 WHIRLPOOL 78253046b6cb97f261ee33868ee20e8c58e793d3ac63f8a02d2fd90d7226b635a437de0774a50abccd324f4b2de24c1ce2ba411c9bb0fd84ac4e505975b74843
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_tr.tar.gz 7944236 SHA256 af80c7c930c5ce7d9c1989470d15a0ce98f4f66430889f4d207bed5e8065a39f SHA512 28dc250e86966e99af473e9140413752fa2a188807cc8c5929f834ec749f91936db81545ef500ad6912c7d5eef9b83374c1ebe773c7fee46ae909b29b694ac65 WHIRLPOOL 2f50acf02fe08e200ff1fa17d08b8074d3417e8667a0811cc2a1288038c3c624a416de074ea245e841cdb145f852a90a03879c5deb98c64bb2c3a549e3a48839
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_ug.tar.gz 6847673 SHA256 9f9808057276cb080af3b08294a7c285a6d882fef21fedae1c5f99d89d14612a SHA512 f03307bfd5b8130dc71969fa33be68928d3caa0e2dd48a34b893b78bf46e3ff3b2ea2c8ca8d60ab032ac0ff8a5dafececbf73ee7dfb4bfd777fed0a887b85948 WHIRLPOOL 389a2c6271f8d1abfed28b4fe168891f6cd074f073fe5d1a8095ec43dcf86bf08e9e2dedb50a5ef6d6f5ac9ffedaae3a717bc889daab1d43b5310244dc6b01a6
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_uk.tar.gz 7336125 SHA256 bc27e18c1cac5f1657e4823dfb16aff53bbb0f69b1de9caf73a4f2dfe5c0c0ff SHA512 d9bb7e3b235c4d7322e2f7a4078a08e3c191c33cd5f9568e5b093a4a4818ea53ab2e97a5a6ac9191610b239135c5a836264ec1b32e5271e9afed6485aed2777a WHIRLPOOL 70c3752406dff24e0b2d3e339bd9b9097a9fc9eb802b11bd40b49b99fa865c9c41ada39cb2322673b27fdfd6c0f77922677ecf4de7186f73c3c8636c449305f0
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_vi.tar.gz 8159252 SHA256 1f6fe0bed021862b68e39d07aa2c4c2da7bd35fd7e5cb81adf144d1cb56adaa2 SHA512 a3e0a2634559ea3567bef9a3a4ad32113950d1218b2e7585f26f1dc8c81a8ba020ceced65cbc829753b7e45862a20af566b12f64cdfb9b402d814ea7f199016c WHIRLPOOL 509d18959a8c7811c9087e424b72af23ef4da838359f3622e3d24120359c9602a320b1542b868f7131780afef3336e99183af565e61159642fe2b54fd2a64c0e
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_zh-CN.tar.gz 10724937 SHA256 674118574e28499c55d96c0b8fb56ad9964ed8a594dfb3f356df2c60bc69082d SHA512 276cbb36e2b482de9a872132418dba71ab31bcaf5959d0ad8fad80fe8c726835ed4fd9c7f8e92ec3b4c50415bddfef7afce3f62e62f3567567e3a802708e9a40 WHIRLPOOL 1d70ba2f5b0325b97dd6b47152cfa8d869be3cda13e94c0eb5e121f00444125101d8f6d763072209832c214ac0c8986100f694c226e5c641d7576f0fe68b4d1b
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_zh-TW.tar.gz 10763558 SHA256 2ab720b698f42533ab5f1e5fcee811bbf7fa068fcc3c680aed9ba52ba3d5f3c7 SHA512 75e35286e896f604dc108a0b5f816d2d7e0e4871c9860700c042c44d7bba3df023d62cd2a0d7449a9992b8e70a36c5068543f6741e6c3dac48667d4f0838a57e WHIRLPOOL 1789be7bcbaf777c2a0e5390c47d6cd0cd4d67092bf7c673a07ddce3fff89a3af35393cc9b60874b57a16fa5f45486bb6666fcb4d8dbb90bf9284a990791b04a
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_af.tar.gz 1116713 SHA256 75f7fb07ca3d1d74efc534d6a98207bf37fd9353d7fa6042581fb9a53befd5bb SHA512 48148d9fb4791238241b96c63e51ed012fdd55d141a7fba6a3c8d4b42a0b46956482fe2a2138272de67cc272fb334eec08f2bfd3aad0f2c214b3ff07c32e2c28 WHIRLPOOL 435f2444c3ead36ebe27a29e456517485b7fa462aa49db046c2a888835f58919f8bf26107d624097d649d6be9fd77c596d5a51e5cc5f2fe0d80419a798ca7389
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_am.tar.gz 523275 SHA256 5a2cacf4d62a2296d6db3d0cf428f35f4ac8037ebd67bde8e2b6a6a673303167 SHA512 c8d5695518d339a657796c6dea3e65bd60765c9018d7489341f9b95e93e1e9c8ed91ff76cb8b26c911a20f1904b0a7b799522f63dee7e866ae489315f4c8323d WHIRLPOOL 94a696c7713be1f295f16346737f7052ee282f0cba1f88e858c0e2a97eee824dea2cb8101263fbffc1f1c577cdc303c44ce8e50e7187bf4e0650dbb5e08d2258
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_ar.tar.gz 2264871 SHA256 d51fc43976f5a409c547f69d4418a35129462036af30d27789915785641a0e95 SHA512 75d53be7e3b1946b02ef64c41cd6c4048bdc5a398f61cfd50b3735b3bf140edd80ce7b109c05e2f16d69511085d143c34a15357005d739633c748adf7139eb77 WHIRLPOOL 893ee0b60825128bbc29e8c41b52c3cceef3c9200e3f9893ee7ac3106710322e5d4a4a669853422ca35733edefbaa2cc538be02c6aca9a6afb5ef8be2bcde71f
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_as.tar.gz 549242 SHA256 26495bff8ee06b10dc825f0b24a071b598db4e32bbe9061aa6995addec59711b SHA512 d4e1a08467ac9caf216c7677d9fe7ff080ae2f51ff3798e45b6fb671008c01632c599fc2018ca9571187b4a93cf7008a033d9e078866f83e2b5cc57429f806f4 WHIRLPOOL f7366f5e3cfaf9d6f7c9e9801704f8e65fb1222d7c04f775a4fd7031ad8aa78969fa84657cef61fe00ead03277882e3849c544e1ae3781a9e83eae317ef4ce91
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_ast.tar.gz 505692 SHA256 06f8e386fb9add6c1a016216d35da90cd3e7614c8fa8010225b6d0be379f19ad SHA512 78f178c1f3090c70b29280981bd97f2adbc886dd68d77213fecfb0cc99784992172a9f5daa6bed18a2605512cfae0b2816088ec846ee430bad36ecdc6cf38175 WHIRLPOOL 3dcaf6b2693b1993724ccc4ad81a000ddb562c8699bac50120ecd85570f9dc4c4f1501b7d5f8b43c9a5534a160e3c5a24cc2d0f9649a01578dc29ed7cbb56e87
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_be.tar.gz 884898 SHA256 f043ae8e3927a3b5c72e5a585d998f0ec868d56c8f895547be61982fa53e9310 SHA512 7930c8797e0615cc33018dc54e29a58972a9a850d025edb6e3221c5b57266d17d0a097438f1fc770577903c5b085e5a938b2188be439df8cf6e5ed4d3df524d5 WHIRLPOOL cec83806e445a32d2e860c8e1aee1a6476c1ee1709b455be3b67a3320f9b6a66e02d5c79328e599d2b4045f8ea8eb441a40bcb7d5fbc9ac28367f36c0e217afe
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_bg.tar.gz 1965860 SHA256 e55d0bd76b6f52d086b52b078e6d6f615e3e6f5b81ddfbe7724bc1a42c48ad13 SHA512 c85a6fea6fed3f6b6b3c69ce2bee5171b503461de282c3146632f7de9dfd8097b5eabb8718576729a3d8a52b44f5b6765ed8dcf759a12c2cae33524a4b2814e6 WHIRLPOOL 508e9907af2603057bb070937db79a22466adb53ec8f3b00c7495fa7c729b1f912cf14f125f4701558dbcac70d82daf267221d4791f61b085c6c7895de1e99de
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_bn-IN.tar.gz 556939 SHA256 d9f1c4d3b2f01fabe9513dfe3d7f1feda010e2aee326fae4a0e108faf836530e SHA512 45d537a04dd1400cc524c12def8ef6df03398079334c961800ef56f93a6e45717275ab03a8877cd5d4ceb23fdcc6ca89f911ac4db542184c558e566ea738b085 WHIRLPOOL fcb654e9115f8d26cb0aa2d22264fbe5e3f89c40c27b5ab02bebf5608215a9ee81eb3bbfb6617bd68fbc7771b02ea2dd86fcd0cd50ff7176125a694932a2978c
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_bn.tar.gz 903996 SHA256 0ca63dc29e1a60f18f74cd102a370d83f50ff2f5009ee7d01963cfba917d6cf6 SHA512 b0a4f6745d3381411f5b16404fe7519843dea3e23e68af5286890c516e648c5416faaac30df2a326b47cb859ed6fe2e108ba61d91f9b04ea167f5b77b8d624eb WHIRLPOOL daeffff1dc11f8007a79e9f0b6629601bf650f304b50bbbd065dce52887b566573c2c5b336e3870dadfdd2a05fc3f3f5060ab0eb6829ac0237248d76e0cca71f
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_bo.tar.gz 539887 SHA256 2bc63ba16170ff451ba768f7e9467be43e3477af166506f86bc76b5e76e4ebd8 SHA512 22ca93f37fbbf822fc5f1b4b3f34fad5c63e0cdc4e05c7f1454113bb9588ecce3d61c6d3ed30a0e666eea901b94195ab895dbfa39552e15a71c8a9cdc7547822 WHIRLPOOL a757ce2c93c5fcdb63e1489dd7e3e009758591dca7ba03b568d9e8971689a9bb30591bd90d846e1699db97d00294d3901912e919b3cf73ba6cdf4d3e5b6e041d
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_br.tar.gz 1720753 SHA256 64d653d4acbc0ed01cd7283c74d0e4c07ea3686fd7910cb012a3a4e71c4616ea SHA512 4d2d7f87115dc3302d5c907f59acec652057f08bbb7685204cd6bb02d11f395b1ef75bf0bc6f4b7d6e392fb49de522a7a4d92657e086f1d17107f3d52fce5c0a WHIRLPOOL 0ae1f92b2f218e8012f00d982986f546675360192b5a4eb44fae33e9ede17a66c8a681779520705f5105f92e9536179164cd52583217a623f060edfc4614a4f2
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_brx.tar.gz 517685 SHA256 3bb1e955812c47cc337d06d8afaecace854cf0dbb4a78930e369af9f9c76294b SHA512 9532cf25b9b771e32297af35210a3219cb98ba4be7cec521efcf0baf03332be1927279b2f7aa958b96e4b30ea190be276a0114074525b87dadd9f78eb9c108e7 WHIRLPOOL f1a5525ce27e2ead7fc31c9cb1c405e504e2d421927c3496d87cd07419d3977fa7d468d4806c684365f3aa40de1b0370ee54213dbfecb42f784a125fb4be1b6b
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_bs.tar.gz 619419 SHA256 9cfd4ddfaed65d9dd4546f0b68cc9635774432d9f4817c8141af7a244d5a71d1 SHA512 7254eb1acce5da2a80eaa176e0543f3db416384345b4aaba6b2d96034191bd1fe84abf2eecae6e64c8b9068b8b3a7de2eb8f02f127b1f4b351e8c1d52206dd19 WHIRLPOOL e355210a0912e7c974d45e626ec212c4bc25a5c97491a5b79af536afc531a44c8ca8ca024ed84c2e2c3d8f3953cb8401541adc57349e3be12a224b69c1d21955
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_ca-valencia.tar.gz 1774220 SHA256 327a7c34e22eb07f4e8ee38b851274aaf2696b63587c93a841ff3da18c30841a SHA512 c921655b32dcfc03feb745c18e93cf394c6cfd9458a9ef02623ece6df868b993caa133d54751bc4909fdfd3101c7c414a636b46927ddbe59e3256bf4618db6af WHIRLPOOL 80f95676bc322833c248955fd29fce3f2d7202670c941a56b5af171f1e43bb274e2c7315ce65af8cd3e3691c56e5fcf251e96b754f60f029c910f9936735cb05
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_ca.tar.gz 1776339 SHA256 abed4d9c01b2df8d1063846b3d93eecb2a07d8f24929de9c24b7dbc5123575d2 SHA512 f2a2063a57c4b04fe1c8b12ff86ff259680ea8fdf33fe23e9b3d7b828e458285557a7f2f67d2a3638f1f5149bafb5789d1b50e7b037c6a6d5bdc645296c71b56 WHIRLPOOL e03c12999359a6666e3f010724c6afce46c2fae330179dce0312456afcdfc2f89e816e09fb8b35afd90262cfb915b53d06af03ec425b20c0b8bd2aa99cecf972
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_cs.tar.gz 1238416 SHA256 b6ae652bb17d5c086cad2c1571f6db80c337b05a42e3bc9875d1772848054297 SHA512 22f98f9fb22f53bc68fc1de345dc5033c49501ae443f972af0d76f4e1898487342c38450bbee188fe6633de42ed7ab4090b1f50d0a2cf555b370bb626ca77e7e WHIRLPOOL bfe362a3c64a18c532bfe2e58c91323ace06e0e3a769a7e4c557b24abed9ea712be4cb73c226097c58a2cab6d2ff1c4dac0d51344ecc9f7aebbdd95791e91c8b
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_cy.tar.gz 484556 SHA256 0fa497b44574e04fd375ed2adbcae4dbbf4f89ad4b6f11d1002b1328fdf3c13b SHA512 cb6cb465fecddedfabaa158cfb862ebd8d116cbb758d4e40d3a68672b82a7bee4179af8fb68686363f4bd852d19b177334179bbe1858ae399e302a471aede68c WHIRLPOOL 77363c888784706302c6fb91e8511daa11d1012d71484979144144abd0b8887f7dfccc35b2493b688970de4daa2c0d2e1ae832c9a44d3e3be7d89686aa3be787
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_da.tar.gz 2388676 SHA256 ac82496f294b4fc80a7c82c25249656634893c21dfdc90f2c1a30b04c928355d SHA512 158ab667a6923d7975a1f804b7d31fc16f36908f49ebc206f7a9ab57d938e739607e3e00e5204c57f447a6c5e47c53392f33956b848bb00490b695a2eb99aaa4 WHIRLPOOL d78be2d3f629f6711348d7dd02e7727346e923bf7b5b6970e68cbe0b0ee732779843f9eb6b24042d823e09ce2828cad980b8235bbb664a53fb08a25c70095e1a
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_de.tar.gz 18842891 SHA256 9f76916891eefa4eabb70aa349674a98386678a75de8c7037a59c648f8adddd3 SHA512 6e3feed6fb9ac9b279adb455d3db2570d341cb69836199359214c2e4b85974f05f81dc39ed3d9b90f3139ca85a7cb2b1a0cf50a118ddff86703c944b97de72f3 WHIRLPOOL 2e21f37249d3ad789877f3910a52f712792edf0140fee1fb5bfd623c3a0b3578e147274eb249789b1518e5849559bf4ddaf9e8701073cb855325b4a2d14ce7fd
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_dgo.tar.gz 548628 SHA256 c151056ea8b852b977a4150875116af0b7e18b3ad235b43343e849a9d4e39552 SHA512 84e73e468e0e6b1281f546b39065c99c217332292bcb35bed6e103588dd23685c57c5fc8b9bc842e2421ec7599ec26bcbf22f5d7c37e295325c35235d1a06714 WHIRLPOOL 98d48abe679a31dcf1b7c470800fc106e547a0b2a2df0db3dd3098fee401e1bb1fa2c24510d1b74f6065363ec351ff7956879a8f143ddf0a201a3ac7016741e2
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_dz.tar.gz 544408 SHA256 f5ab40b85d2bdbab1fcfa01799ab139fe3061c6490b5057a4e418b6735f390c9 SHA512 fa127fdd5fc2d274c493120915d88091a9db957f04167934d1abc642845017a03a94693ca7fae461dae7063247d839e4016f67b4aa348feaf2c346b8fad915fa WHIRLPOOL 08dde67db15ca564b26605c71d9473c3e0be80a756ce6d3bed2aa445611532a1a240cf0254f7bb75829be61f1ff99edd28b952fabbf3a3c5ef22a567c3779dbc
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_el.tar.gz 2583019 SHA256 be6c02f3ee755502e5b0b62da0175bdbbb5fd72fdd4e1d957f71647a91e21815 SHA512 383a9d8f94ce42154c5be4f5d7e9462ba464625213a90bfb917ec3d500650e60b9c1f2371342b610c30d96d11699ad013c6e661abdd3ce3144fd5ccede0093a6 WHIRLPOOL bebfba5ef021ededb233b68f21fb050e3081453f2f3db26b0580d17b41b6ff8cbcae27f3bec33027a28387ba948f2616928f3e243941579d5a46a549ec5de6b6
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_en-GB.tar.gz 7122489 SHA256 7803b290743ca7ffccbbb5db9b5b8c5b9ca7cf88d57d2cca2b09b53a9abcfeef SHA512 24b8b777684ec978823719b1e194d1c69917883224f2cd7c1bd693666674e02a8aa81ab6916f2d7871ddd9e1b902da3d06b54b7dd76fcfbe2d51d012fcccc7ab WHIRLPOOL a0d26b3c3b3c5b5d5e43a66bbba4151d44244bdde89eada67238d39ccde5650298dcd3c5adf404f8c30992efef101eab52a48b4d11dfde3052a880ea7e4d53f4
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_en-ZA.tar.gz 7039487 SHA256 b21733c5bf9d7e6a2fe226746052fddddb124b0a96b24102215bd2a1442f462c SHA512 5c3e9813eef4ba9a7a31a8e0b10a5b00422c703751df316b4f1913058f763e9979034a25421fd89afd40842b66aa8242dbb08c0f5ddaaab996fd8b9d3d9e15fc WHIRLPOOL 87d57efd80761a671355f5277bd61759fa4836fac89f430bed8f8979f57072cb2690cad53e6abf3c22a57a51fa7d494b6fc9a9844fd215bd3b75036e46726151
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_eo.tar.gz 481662 SHA256 fa5be6b105636db32fcb336f114b26a92b923ed2a7e7417ee1f07fb4547ada77 SHA512 ff1193b9ab1d63bbd213721acb27062a6a838cd946b797397ce13c41f309870ec076106721151460955b45fcbc056fa9d3783bb7cc7c6310b48859429ef52fb8 WHIRLPOOL f29df45a2866db420da68d10c0d4f8e6ec6268a7b5f2db50cc9d24f1f8da4da110eb5b3591b4fec211993fcb84843b9503a812eee9348cba2ffff81c70eb6636
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_es.tar.gz 2027809 SHA256 03a4090fcdd344a860b751cd26ad67ec0555fe4988db12bd1dd188c872b03ba0 SHA512 c6068a90ea9b9964b5a8ceb5941c91b06679746684f1ae1d68aa3bdb7924cd688ec3ffb6c6ebf86def905f5132c3753c968ced950693436ba3550aa7c06ec96a WHIRLPOOL 1d7cfd2dfbd783a5801ce0b8d014a44305dc51646f3ec3529028ea875c8ef87448ee34bc92c177211a6cceec498e0ffdcd67adf9180bee9c3d29357764980046
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_et.tar.gz 1390866 SHA256 c04705d6f410e5966e536c3f4e0c00db667a5cb85c470f9571c67d66254b1aeb SHA512 88a672a6cb3330f5522b5c774a3329361e7ca318bd24a1a0eda613d56d4990c2d39ee7cab05d9411826dd48494d62234b03778f3e13a028521b09f7450b43c98 WHIRLPOOL a14fa643993be7c0194686305eb35435d9744438ad25b2fbdd2cc12d780c26ecd95f2e0d1d23526ed81422c178c6e6d0b825f0a4d935462d9ac1251e76b4f0d3
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_eu.tar.gz 489377 SHA256 16023593962dd371a1fb0cd246713cf708e778f339e74bdcb684239a2e407f61 SHA512 2aaf922ceac6e2479e91b3fac5cac0011c47d4d37d9c8b97258ac9b2042146daac58e5b328b9a5d9a8c255cc262083c8a495332b4f954f5050c19a9a0237d312 WHIRLPOOL 0f2f2128811098a789c3ebf6edf1591365a999272d8a41448748eed1097301aaf376c84ad9417471bec96ed379e7d7c38657c1b124ccf59e0d250b561177acaf
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_fa.tar.gz 512676 SHA256 8e29023c1834d09348eef336aa0ca26d11552eaaee646880457d22b40d72cab9 SHA512 14a132f05150a80c445ece3d2fd5472703a357c238e7738a7a011984dfc25ea61fbc037023fb2d52f7eacc2fdcf298a14f6cad222d7dd92858acad09e4d61599 WHIRLPOOL f642dc6e5c0cfd7203883839fd70e782c8369b94ea60c4b29463ea6a5979b30959ec32307c9f746c99339e2c6b4331d6eb9a1025d8aed72d80849b14fd039635
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_fi.tar.gz 497318 SHA256 aa9ff65726b7e85b02ff3e5fdf13f8c3fbc3dc6c9e9258d9f19a22dccf6804f2 SHA512 4250f0904a3101e2a96ca826d8fad4944d6f525688210a304e01f5b0666db933af0b3a067f831dfbf241ecd477061fd4df38eb0486377700ec6c85f500a62ec3 WHIRLPOOL 124fdb2752c5e5a95afe1ab89d036274aed9054a8b6f54434f5cf20c144eb3ea73ff0c176f13a95eabe6902a6393b0107e8aa1b4e66431b930904ca208ef8009
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_fr.tar.gz 2821358 SHA256 531a8f6f16787c0a9ea97329554a158b3ee7dea8f8ba348e9884a523f8bf7e36 SHA512 410a5dea0b8d48f082c978dcbf40e8d90b9a49a9c6db66524d2f1f990711ee327f02469d0d67b6952f090564605a590312386ebf398cdad9f09e05f970203848 WHIRLPOOL 30ec9c8a274aaad1b2dd79787659fa10428f98388ad15ef06dcd7810887c9dbcba2d2b0f7d2bbdc7534db7e4111449db33afb0385903baea195094ca7d8328d6
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_ga.tar.gz 506997 SHA256 ec1fcf57effd0f107d7718384e0ecab62c24ee682ea55a2be3de8a307a75db03 SHA512 9fbd56b782d0022bc67da0eae0015f063aaa89f312c620cc2f4735dbf2c3304cde815f0de5a1a741ef232a2a6a21e625e9199bed73e80d6985a33445ee27c837 WHIRLPOOL 3c63d2a0b8c8ab398639825410778fc3378dcf193eef59a58839ae47e047a7288d027cf3a351c46b6be6e224f7fa1f656c7e727e0bce9727d43d0b7f260594dc
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_gd.tar.gz 1086536 SHA256 a164ac036c25352259328f5f441efded27f491520daa34c1724c24b021877739 SHA512 b42f0971c2545de2ebf221d58b3e6448ab020df6c51a286baadc0196289a2623abfb1de63eb7d78a5b39f9643d28a6d16c68daeb82b5a22b05c29f655d1f66a7 WHIRLPOOL c93ec60e6736e9a274f335effa3b5eae5b5207a758f477192e04e2d4f77433571369f8d94f5960efb25f3afa8b08de83e7477d02b4cf00f7b789c5d3269a611f
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_gl.tar.gz 1055767 SHA256 66a617221311ca2d3bf80db3fc90eb48f7e3ed01454b75d1768adc75b880f62c SHA512 c57e68b41c47c272b08b22b76ee7d0f8ebce06b0df786a38f1338f73bdef54017cd9b906c827df481236740d67ca670d7cdde7be16b2121c10cef32a6f4be530 WHIRLPOOL 492920b012eeff16c4f7eee1e5d1113b94204a4007ee838219bf353b4db179afdd5df7480905d58e6adffce26a77a9e6be024b956759d3a470dd69a9204ee29d
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_gu.tar.gz 1193592 SHA256 b444ab513bf42da37b70a72660c5f889c48a913c5cfa95a551c7b9b4cda77c2f SHA512 63249a1dc7ffec54eaee64b9c310c753daee4ffbd39adf7084c703ec0b664b2fbb9860d4d07db91a9af57d54d8ef751ae727d1326f580e92df3579f2b61d60b8 WHIRLPOOL fca557f7c9820e905d4c68e929eb54f950bbf1bea2200254e2b1f5cfc31bebd742519e6cce6165b85c3d4c8afa16fc0f92f444f859b368d58dfab32fa9a0910f
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_gug.tar.gz 503818 SHA256 10d2c68d10b54d8b820e7c9227c8872868aaf718890be91b0327aa7a016285d8 SHA512 92d4ba4c520c6769622067298b57537b510eeab9944a7c063038be256462cc3c77b21a175d132b6013273c5bdd3dffdd2f7c7265c91418007a6e6a5069487626 WHIRLPOOL 754df0699cf0cf4a4b349a8da5549f0604ff2930ee34358eadabd36db198f8281907a3e9f3162c7cfd6cc436e5d9e44284d6e1f92b50e604c89caf852f4965ef
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_he.tar.gz 1584411 SHA256 f850a6f79b6dcee69609a75f7c03adb2211304f257609d34c05c21a1cad662ab SHA512 0b8531f98cf194267814c871f5a4e3221501c451c109294d7e229a73f0518b89faa83f24aeb83558f18498e01317aad4b282dbe1970ac485a0ed692e9602fb28 WHIRLPOOL deed62486c10c53a211326913e251bea35c47e0d7033379d30b49604cc70daba612c9a06e358b6a3c6ee648031d2107bf033c9599c02e4d5785e0115675df18f
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_hi.tar.gz 613687 SHA256 be80e7d82c0e4503790a921cb0d24abafe4b1ae0b0c4fc98aa93ea7b51a9e5fe SHA512 cfba2f2c1bcc455c451a43f735d0692729f93a5cdfee34706a5f58dc585498a63b1fcfc98759208debf1ffd1e10a2650df7089b1fad865e352890ccfd9f8437b WHIRLPOOL f351a1cd8545b87b8cef875ef73c2933727f7ab69075df3b422e2f540327110dbddec8af7881203707b93cbd31fddeff1a5929abc18029b985390d00a8d27156
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_hr.tar.gz 1258975 SHA256 84296c3c8acec5660618cc03f1ec528b582b20a6c3fe18a109ac912ea1ff3ae2 SHA512 8c937fb551a845ebfcaaad8ddc34a4e0d59085656d5b6f345f69ed26820b11f7bfe5c3ae5c34ade63f33f08c5707ccd8145afd623cc49ca85c30166e1d7abd06 WHIRLPOOL 0b593a122b8dfa9bd9f56e629a86b66a1099e3656499a2b3e9c63bcb55f7dc96b369b598be60ebbbd0f7a8cf703112881d87398fd95cfe6a7b837f22db77ff00
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_hu.tar.gz 2718810 SHA256 f4bde6df6505ba52563d13c7cf5b93c8ddc87676d8f1a6f47f26d3b3d7f102e4 SHA512 820132b7cf3e63b55001f49f6a92e9d1f7e238f58477f45ec718091ebc66425199439448883c070b2bf2b23ac71907ef88e4489a6004c1f2f41753e1c2282b18 WHIRLPOOL b20e97207a33b96334d7dd1ad284e37358bde871367bf6587df237f957bf366f626c50e885d69a5db84c6f3acd5afe5f304d2929366c5864c2683fefc193147c
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_id.tar.gz 483543 SHA256 f96db79b76182bd90bfe9e3da919bc5431a484bc2dd34f282635c93ab50d816c SHA512 b6bb1a245a663ad6eb7a14ad2238ee983d3cc8b99bb7ebc6c92a0cd24313ebbd74158059820b64f4b90d9788c061c65be31699465553563443f9306d26276353 WHIRLPOOL d244ba80565899bbe056a9af77e32c57b9c63a6b02dfb1a9dc99084a357e68b844068ce6c0d55792f29a0e80fcdb6628bb7d6ac4900cecd43e8eba37ed41227f
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_is.tar.gz 1224728 SHA256 a8c647167af6f371f97268bcc9c6faf1f7f716424bf067123db311f5a440e49e SHA512 e46cb453f6dedf4e877af8ae8b2d03cdaae84ef24e0e0630ff2a593f37534ffcca89ddeb3c2c4c30c30f16ecf7ee13ffe60b087d4ea77d69c0fec444724e2312 WHIRLPOOL c7a63d36c625ca7563a971c18292af3b10b17942f5e1fdca74f009381268aea39dc186bbf5b7cc2dd5bad7df34afa781914d1b3dcf9aa1b431db7fb490321f20
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_it.tar.gz 1828660 SHA256 093357081d71618a7524dcda9ab36228cfff780700c3285f5f2c80565a492cf8 SHA512 5e1ae08f594622a4e43668a6d8079b6692665949ca6adda64cbd0d10acc74c7753dfcd14438b39e8e1b8cee5add31e9e70197169259a77faab9bc54e5d4dc370 WHIRLPOOL 45bd89a350a24db62b17b4b95f61c1203cd78d2495a53a375afb159812b668d72596c15cfbe7d889997a825fd82bbeb6c3554153c4b996a74b325c3bec0fffc9
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_ja.tar.gz 592080 SHA256 3811b5a06b350b6afcd332685b98e1a1d3cc7d4d4985fb6f815fc3822bc8b1ec SHA512 706e6ed934af87276f4bc1d4c620fac76cdea8c018c1dc2569d8fad0dc5d211ba31ebd8159389e4426aeeb2a2439ba3fd1e4458f0842f9e19e5f7e31f561e8cd WHIRLPOOL 39f3a4efee8c470ce5d7d8a100f7aa981c4dcf2fc2e7d78a92f0e64d46fe4b2257843e3ac80bb0847928c2a1a2bcc08617f54d8928cc0e6d67492ee3a3ec3dae
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_ka.tar.gz 526878 SHA256 302533f6fdfdbe83725aaeff253c1e9c10073a561cfda544aac785196331b3e1 SHA512 21548e344afa5fb10a28bbae8b2f304f7681b9fb713a6ca0040ecf07c39858abd0cb34ecc83ff8fc3af9b62eec6c86e187409d2fb35acd2f62e37b7f4e8fec55 WHIRLPOOL 116573f5deb82a3a2d91ba576fa4e960a6633cddc81b6efa9634035e1eb41850b51fa25341b9f9e4e93a4e5b218a22ddf6cbe621bd5fb6beb8f3fd61286bad3e
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_kk.tar.gz 538732 SHA256 c7243bb433ff3d0c3b4c7464e19f0d3dc3b06003c363bf31c7277d9bd9fc6916 SHA512 b1bdec2afee78f1a0ae69b4ad9b8da908589d3925b53c2f8ee05cf3227a5346d842de8c4b544f1424bd683b56f76c0336030ba5d12dbf5b531d86583f0e4b34a WHIRLPOOL d8ca5451934baa22f079421831d44dbc1f04e18a4442f724db09a96685cee16293681f180566b9fe62235b28d591c59752a2a4d23c0b8c380f1419700b2db72a
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_km.tar.gz 645400 SHA256 74117b35c868586bb8b2f18a31eef2b991c3ab75f65cf02cec6f821b798eedd5 SHA512 8fab5efb7cbd8e767f8b8829bbd6672aab502762aa1214a2802470f9a7dc5c039d91b74be585a90c3a9c4c235417681603972c582bfa000207c47c7b8af8228e WHIRLPOOL 4a137d9b7cf12804b20a73ed94ea81b8ca407f76281a17a0435d5d6fcc09e490a0f9b630cbf4201b131ccbc8a3edde8f6d19660e44b94b80b7df86b40a05530b
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_kmr-Latn.tar.gz 500298 SHA256 ad42c4f7e7e47bf041c34b3d2debf529a7c510be85cea4796f23e58a73433e53 SHA512 681717e9fa555b6488d13b3f7303f38a97a8142235af23abc6f1846cb988f718da762f064d585c0098f47cda2be4b25003ac801c0672c17a85b99450eb414f28 WHIRLPOOL ff94d91e57f49b53045ce44162baad2934a087e824dab0a17af73ff536310649b7912831438df4cc4637fdd986c46ebf018425d8e131fb0e515d259f34e0f48e
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_kn.tar.gz 557640 SHA256 6e98a1ad25857bd60c3086596fbf1f08cb2d3f7394d25ca74076e5b7e00ae50c SHA512 1af5bec2029fd666b3af31f5af7480d58816bfc3122bdd1533ea7cc53ce461654f1093d943145d2d06d96ba4ec60f7f3d0a76cca5a2fe96e62e07d69133aa9b0 WHIRLPOOL fd62258c12d8d25715e5940fdcdcbde710f07128c27d0548bb1e487c087c8420f8da62602c30e020377069c1246485a2e517b5a4ce43f6dd3ae6762b13bbdd45
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_ko.tar.gz 584356 SHA256 b5f544e771d29388169b11b8f2dd070a2de298f5160b754019c3cee891269e45 SHA512 801d11adcfc9d8ca3723798daaa06f1a019bb46c87a75a8300f6fed0462e75593c9196d210b4c3a610222c1332ae54612f53e47d6fd02e2e1f24e695bbd71b12 WHIRLPOOL ff1fc4b5e595b01f83bb94c87b1202ceb4263f65f99b1c79148a9650d94ab88b248bf292cc040cefa98f820d7a7319dc491f5d575048e18e7497b4d1d59d0b6f
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_kok.tar.gz 541535 SHA256 7fdfa61846e4df6664a1edd178c1582b866415e5059f981ee0f6b24de4dc2a4e SHA512 7ae36192cd99cbf9f2197d538803ede85ab24664bb75eb5f11351f38194dcbccee9f0e1491ec5b946c2aaa133207e7c24732a3c3a08a6340e3e915484fabbb8b WHIRLPOOL c36b4daf981d069a38051414f6b48df1c86e1fe3c64a5fe66788f0eb3dddb43ab38f7a79ba08e9567a27365eab8333566b78ba448578c9bb50d281bf30bac0fd
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_ks.tar.gz 520141 SHA256 ef5562fe5c6731945bd22c5312203ac99c178e1379422c481d7525a3466a7b72 SHA512 17f4e332638221c5bd49585be85a5a67a9f5134e562cf1096e741a4699ecaf5eee635706e62f94c34a653111036ddcb77c25ad432d22b64467dec7ff2c9f18cd WHIRLPOOL aeccf9c08a6e0edc0cca9a30298fc4b7e9742b9fb1fba3cd69e0d4bf43fa754bdc0916e4f2b47cf5fb54ae51574a3b1a6e2e976a0133dd4669f0ff8c415f44a3
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_lb.tar.gz 469948 SHA256 7ade5d839b5535134aa198647f60b1716947c96fdf7608218a98e90323fa8977 SHA512 1256bdace1a6cf435ce3bf41bcb4a2b34e163d0b1f03aa85541e3e3db4582c0295796cb2d492d22931efee87c71ea1cd010a2411fc355894d4072460a5dcf637 WHIRLPOOL 039d0588aede9519f35acf2014fb8f65a808765af1ade6ee733bad22a2e5a881fab808d0cc3e15984a4324148753de7ffd1b75136978bc2f22cc84eead7d51f7
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_lo.tar.gz 562714 SHA256 d0e4056b239d53c7c1167c50c92134d7d2aa390d378d2d7dc63a829dca69d5ec SHA512 b3eadf07d488d96e3ef120ef6b59adb24cadf77f6d088f76e52bfda9cff39906b6b6bf12217d694c4365b2e4f7a5dbf128fb28adda25ee561be98c0541e39b17 WHIRLPOOL 379bd65a8f3103c3397b8a8fdee26ab0218c8dabbd8e796ea2df32498e9efe090061cae2ed9550dd635b3db83428107da6ea6042696ee35c6de1cb28550727c8
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_lt.tar.gz 838444 SHA256 bb74c95f560fde614922ba07c432dac2ebaa1fb4be51086cda06ce82be889686 SHA512 d3cdba5c35633630deb2f30fe0a6dc57bbda017b417f51e060cbf611ecbe5c7b5f230aefe0a9a46045789f0db302fe1e5e26828805c21227dfd71373c1083e83 WHIRLPOOL 690342e4ea099693dc3925cfb5f5e30fbc8fa84778d28fca3ed20960fb1239301f2199efe248bf993ef2b361192ea6538706e702546b3caafe803fb3a2d84ac5
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_lv.tar.gz 1253848 SHA256 083ec96c6079d055affd3301b741414db3186f7c3b0a26b5705379392baf9d0c SHA512 d2ad3915b91fa94692a32d4251933a4bc173e51bed4f74f8f36ea1234ad84bf571e9e98e6d3a8ed8b1037809822a183cca8d50c4e2cb78d313031ff96a91f02d WHIRLPOOL 0f691cf7a5e5da07fc66d76b8e1c71c4fa3ea7d6232ec6cbebae4e4aee927cf652b06de4a2be7733bc6338a5ffb3839b1a91192f04427489d8ee8157ae6a9779
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_mai.tar.gz 523193 SHA256 f1998ce07ab814dabb36a9cbf053c07c5f7b5a75d36d9f49460078f9ba0ba430 SHA512 7546f7fd8071af4ee4c8359c0912b5292c772351007fe8fde04e91291a54e05f3c9fa36e90360d100ed5c5075b02c008653009fed3a479bdb7fb9e2c430b0474 WHIRLPOOL 0b81c5f903df9ac26ee986b2c67931a2d539757a01951456728bb54df4445194b4c02b8c7d38757f72b58319506f2a2d3014b0e8bd2da5b70ff3398959692eba
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_mk.tar.gz 521419 SHA256 b3d305f9ef6439b33736eb92792da4741fc64f50abbbbe0a874dee01017b0c27 SHA512 16afdb37f51ae43245f4c1aeced46d2370857c78ec8e44dbb24fd9b301a0e48c812c273bace3e6421f88a4db3a13d104ec5d128847bee15d1219cc010520386c WHIRLPOOL 3d0b33051429b5958aa275539853ef0765201fd1fda397965fe7ffc78c4bfd61599e6de793fbbc58e80964b09323e91d8a733de7058c2fb9693310c206bf18fe
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_ml.tar.gz 564134 SHA256 e9d88f6c72806fef775e66a9a2576bc965384f6ba2923bcda9c46dea6f6c0dd2 SHA512 71b64ed70b2ebe7ae1185a39f598d9b196b4c9f174eadd16a871f2e3bbe7cd7c365f9c6e7ac3be336cf00be29c6d7dce93dee74ed8bfb37c74a1bdaca5a214ad WHIRLPOOL bc3ec3cc4d6f87600d6b7b35de287b1ba9d48dea0b32042a0ecb81dcf41f3614b4cd6c08ca2acc9b2072fbaaf988058b5cad9f87c5d39d9351f6a6af70ec9ba8
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_mn.tar.gz 610738 SHA256 c9260efca0eab884b9737c1cd04621f7a53ee3cfef6adea9642a61da83f3b82f SHA512 1afe1ba10cad41cbb30f26b6e79d93283bd3a9ba0f1da4b85d47a5d8235e45fccc1a8fa69d898636cb84d37ea284d48a9b9d58b1f5aba3e3f8b1945b6ebacf18 WHIRLPOOL f9e9b4a1e53137668b33644daa06f8e90ee29d8e4a9bba4d38ab41ef6cb3d19fd8a16adc9897b99157fef40e37a0da11467960152a4d666c60a17d8f2fbafb2d
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_mni.tar.gz 534278 SHA256 b88bdde76dede107561b2bee2da332026ffa730a85a4ebadd214ff983cb4b697 SHA512 ffe7af779281928f14e07b58d5eda23d7c20e99ff920be2c4c1374c2f1a72bcf377eaac768109fdf76b4f14775af0aac45e266c6202f5887d909bd7d94837de6 WHIRLPOOL 850407d24da44494d6b9c439f738eb12b2933dc111012df89b723f4654090fbb1a38255f9508b98cda9e5416a88bb34627bd5471660574765ad826550f21c4e0
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_mr.tar.gz 557093 SHA256 bf3630e6dcd0d058bed16c208bc98812899cfd2d22aaa17adbfa28be9b21cf7c SHA512 a4243b0737eae1ef7b18d9335b6255e1a768402469fac7026b64a109381674dc96b184a0e9b32676a0bf328808452430df855f2b17dcb0bdeb756c141a80669d WHIRLPOOL 0556a97dd2296230fb263ea1c478023280293f7024f13bbc9542ed5397d539c1cb6308beb941ed6e3fa77ef715b8cf962c071b47da902ed7a9be3021a520fe10
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_my.tar.gz 555062 SHA256 7554a8e7fda5e12aadbaf84f65a3ceef9aaaf88a9269ad1cb3c717930722effc SHA512 181835918f7c93783dea406bcdd5803f34402e34a1c7e61e8377792b08d2702ce69388ce390d3e8b0a2fa45cb89008485f01761bd4dabf0e23a8d784c2654f2d WHIRLPOOL 07bbb4feb3517bf945af91c9a2c86d1c68f181b2c49a630092588c93e9564597645dccbd8f52775f2b09fad81a0cd8fb1c35629de155e0348952b8f477c7709d
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_nb.tar.gz 3488676 SHA256 ab716c613914bba643aa6a75ea43b89ef2a658c7a78d66f15f665dc6b4462892 SHA512 e9980126f73df9a0334f8c6c3982379feb63f2a3672a27b482d5f20d9cec3a845eabac4ec0731bd0d150240229aba124d4fced9c0d1c4b59155c2deb8572fb6e WHIRLPOOL 9efef7b55ea4d9774a04774c8dd2a3eed9acc08aa002a37228f2d22dadb6136c15e3c00018badd9d65f53c6eb0e0af283a45d0cf073b226b0522ae7a6a3b4cfd
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_ne.tar.gz 923157 SHA256 403f6fb98a57ab9b8c96b922f556be618f0bc84ace48d3850dc6abd2495f7ed5 SHA512 a64c1190f7312664a4aff44356668012c4827a192c9ca285a566b41d8d24810f551df01b41b4f1c502f6e84d9b7ee5f6098a0a3a9cbc4cdcbd441e3107261c54 WHIRLPOOL 53c2a787c8f7763bf1fe1059bdcd62aaa98e9c189ebd4ece14eba39885fa9831b09158c5b685feb3b11367dfb456bde6eff0aaf1bdff58e729ae2ff1dbba6c35
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_nl.tar.gz 1285652 SHA256 18311df69f0d93b25d537b3705bf149ca257220f36ad2a5ad2f26f05094c0e73 SHA512 63a71adeab3030a26426db9c8644aa58e178b66523d43d08ad34517a6d6be917530dfaaf633a585d6d8497063f4cee34b4a5ecd0773fe9d38d84df8fd86345ca WHIRLPOOL 1402d610832dd9d42f826fe331851d8a1418ad95fff63755888388fabf49f3ee1108fc666154736ec64cf9d8397c10c46c883ae396de8df30676278b699d3f75
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_nn.tar.gz 3484722 SHA256 8a31eb2d4fa2c351497ff046a6d1e1bcd801cd5c9aa417e473d07f4bb1587081 SHA512 38894bd7adf6b1a56f3886ea55b92cdfca064fd20d636c4d52039a0958dc5e8eb53927905bfe81044480ed87b9c4f535df349610cccb23326fa39d7995262608 WHIRLPOOL 56a526ede8eddb27bcd649538a6c54ef19ddefd403b620e842210a7b1479d2b1508c77afdcf298d3fc68e585077ac380dee76764088f9f9f3897b28d3f532958
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_nr.tar.gz 498886 SHA256 5347d5c3e3e55b2a52d9d6207c700ba2f7a3ef83b0acab24749b29c3809bfa79 SHA512 4f911a8dfe1293ceaf59e61cfaf3a0b51a9b6d4b2c39948a7ab2f28e8c70ac4ee9533469ab8ea5cf87e8f4c6f7f8bf8559cdcf33a9763b44cde3ebd06f0dfdb4 WHIRLPOOL 107bf199588abf19f538cf98955e5c861977935138f08cf37aaa2ce67ea88eb0981c3ef1ba326b5aff4b4359d698830bb7250699d64a453d42033a90a5979d52
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_nso.tar.gz 496117 SHA256 ab89cea04a5b408bbef6974b60127b6d53603b5ef98603331f5f35810801489a SHA512 80aaa284585fe7474501a4a65894d40abd5b4026585e66c6ba167731f7bb719cd65b68acc930359b64ba2b7a5acceee2d3affb4def291f931e871b67a05053bc WHIRLPOOL 047e6a8762f7a902aa2ccdc62f188f960bb23485d123abc840e8522700f5651ae6cfe6876022f69f823b3aa64b5de5a5354ba5157a0eb885fee10531ea7ffef3
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_oc.tar.gz 698666 SHA256 8f42d9f8f99bc6060f299aba9576e338c227a0be7dde4148ae4456120db159e1 SHA512 414db01ed14ba1d2d10e9213d81b08eb326024a6935cd7f48e9ed2c32d1776874dafd5a2eb00f7ebaf9370c19ec54b144e296f23265c60967ae6dcece6fb9806 WHIRLPOOL d649d612dc3f88497d13fca059a6c30ce13bde08b80fa715e1bf84d0c1ca9eea596b4b6d144f68bba0e3626246738cf87a837f59a145176a9042f8c0157c50a7
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_om.tar.gz 488145 SHA256 586b189591d9baa69ac7418103b39037bb15e87a239b85410092f523f888c17f SHA512 bbe4ed94eca0303bf07e9f6b5dfe9229fe9d5c13bad07208d8a625efc535ffffe72072e945af71ba231b04dd750e6ef55be0b772c3706bca082f40cf3f930158 WHIRLPOOL 18ef88b4ddf17b47719884918ed78d26d0303ab2ac74b374bc04b21d24a188c85210406937e73a60719ef29d045728f81c94323439afe394bdb1be5f66e1b8c0
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_or.tar.gz 556825 SHA256 0bf8d6dad3c195d6913777392ed7816ee4bdfe344471f0da3a1c1f9006dc8535 SHA512 4f20c94771a9ae17703ad43ec85b260edf6943ca1cfe248c16eab5cda7a8650f1c4900f8a70619e5c1b016624eb7cc244b3a8c2ee8431db9874314b55f157e91 WHIRLPOOL 25a5b6900c02084eb1b6a8de4d8a4c68a292bbba33d01821373bba41a98dd9a89b1537edaa0b96c7600376ad2cce383b633c22bdb44c9bcc204fcdc2f9e332e6
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_pa-IN.tar.gz 526743 SHA256 ed363f559c960a4b7c6123fc84634c90f7819db7b8de32582ef3163d8ed219ed SHA512 36a8ce65eb4e205806fd49a70294ffc2aec599a314490f068254b55178a892627260b1f8c16bb2e2411e2e1cf44fb0317af1ac1917bc0cbaa56cc87b3c8fc142 WHIRLPOOL 7d1d7abad271e4a8b7eef1d48ee31aa1e28db89ada306f165d6e9c7dec43a4febfc4b65e6dfb2d8f93352c88cb48475e710aa82b960aea466fec69c4f22bad9e
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_pl.tar.gz 3279959 SHA256 f907a63cd62c513ae2264a7557026787ef16bb3e42085b1b27d54adedee1c213 SHA512 64afa320d960a3b3270fd479e6a46ca59c88364cb784f8b5fe8279cf38b69e6680ee287bbec098a5481ed98b401bb1186171cff327bb03bf6a8376fbbf0c2db0 WHIRLPOOL 323e254103b877166d1f2dd04fa3cc89e2e95cea53eb4c1a5250c50abbf9b5c7c96bd3f9ccc1e80368c663c65fa1de4912e9e75f4a3ef32107f1d64dcac1fef1
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_pt-BR.tar.gz 2578269 SHA256 0a6376081a40fe3da05ed579a3e4082bdca7418be275ceaa4252e406f3f8d9f2 SHA512 b4ecf21591b9a24723e8aa76ea91a27ef3300bbedd81829fd593654b3caa9e997cbb2e91744ba85c27365af11615d2098a38b2c641258f2f785dee12a1a95d2c WHIRLPOOL cf541a81ce8576cbec3125d0e71c0070164ec31494c131af738a20c3b574187bc8d7bea7b2f206b76c95e2fe56d5c571b1b00a63704c89a78daa8d305214507b
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_pt.tar.gz 1131175 SHA256 385f06ca4160961c82573867bda9a9d129c3714447cd7c699d952081e77e3842 SHA512 8edc633f1ca1fa099d919dd4a784227da7119e72a79e5bb8ce8b17801e57751648ad58c15a12b1a2b1868e4d7acf319662cc331d92820a81b79e94c395c7c541 WHIRLPOOL 81a24a6b9be4845ef3b23f235db0e8b79bf8f4d3195616fb4d970b128cd1166f3a99c6820adad86cb6738d462171ffb97005bc9c27f7d981d545c06e2a99e5f0
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_ro.tar.gz 2365168 SHA256 84fa05a1234c2509b1a41276106555ab15a88d3d65f21cdd687321114b7453c2 SHA512 02ebda48a77cd48371a5c83d9b6d28f4a0b661e99a75509f4ca5741bdff9617f8f6d4fcd2c7e211697919ad0ab638225dd881a7b108ad4e138ca59c9e3051f2a WHIRLPOOL c8ff15fadefb73aa2a05bf2be90fe9bcc12f265ff648f9a0afcaecc068349c1c142c4db6d3b9f633f9b6deb70a071fade137ff2557fb390774c508f1e53cfd3b
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_ru.tar.gz 1653921 SHA256 dace8c3104f78aaed69d08b86cd18b03b400d909aa2fe86fc4faf2b4c8cf5495 SHA512 eeb0d54dc22aa7a7d6e342d1875608595dc9c3cfca6be779fbfc1e2cc6e848d6e44f74d806e49ee1afa971c7ab3d380b90df4f97a720d114342a28a5e6e16796 WHIRLPOOL ecfab408f4a0e8472227077bdcbea2f843820772430b993b19cfa1418265464868b2de770ad3084c4a73d55e18b40a5a7b5350ae3c1edcba9d4905d3d828b4db
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_rw.tar.gz 491579 SHA256 dec102a84b934ed7ff46fda872ca84a81641fa0768452bb1d511ed70e02dfc5c SHA512 2b964c6465d0aa940a710720481cc07c442016e0cef71e60450f3e03a59e8a7dd1e614931171172bfeaaac99e6e1c4bce5c727c6058d8813b6cc0740e4cab1ea WHIRLPOOL da3db1cbedcdd4c55c04a2621988feebb585d14c80eca7aff62e4deeaa947eac69b254bb8d874dcc15be7f50518b190f3ab265920381615a2cff9f2cb4f25441
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_sa-IN.tar.gz 542701 SHA256 184557215db5f58cd12f61da183e31ab4f2f3763cab4293ce4c8da5120d13486 SHA512 35ef6c48289f42c2cbd0fda0596fa584e4436a0a1c1375dc560236f39abba5da4966f0618ede3fde5158f0865c895cc4ea96e0307440e246469386cff4ae1c13 WHIRLPOOL f1792245e583a2bc95fa7e91133609329d0480a1042c93b6fe2e0658e01dcd523f5e67b1d80fc5f5fc378f74ba63a5a6362a0b6ec1d2761386153b0c82f73bbd
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_sat.tar.gz 583603 SHA256 cfc8c0a00a83d23ab7e55e543828cfc4e969e2f78cc3180992dad1a9aa313c23 SHA512 0030938094cbedf7e0b806afb4da08e01edde85b5b2da6fb6f1203bec1a2baaf8153c63668d2d27d35909716e864652aca2171776afb6911756cf1f457eda0fc WHIRLPOOL c84d4cfb160c1e34ef6bc4c025f14207b4870aa1c17a1e1aef068acba1b50efe50533a5fc605e1798c28b22796c81c38377553ecbb9174a8fd14fe9ea2b858ec
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_sd.tar.gz 534415 SHA256 f702e094f147df234c7c8bb3fabffb446176698f848121c8699d01974aafe890 SHA512 5574b764c3ef7ac9c676308161bce38963d62e1edc9e8d8d01d2e336c7486b8510d6e47563e815241d0d01ef40565de9abadfbca4cc2a55042498115d97b1852 WHIRLPOOL b908447a14e2ef660fcadcb997084136efc13ee9f525acd31e38be3bf489d6d5503f7d947c9f659ec1f00f9553df8f5145e5d1fb927fa16d4487f9af485c3d3a
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_si.tar.gz 825088 SHA256 831530e9a1b61c6e56fe1934b4c4d955da6d6b2a1771beb947272cddfe720738 SHA512 ed17d0ed6446e4a10bf4cce4d24178ca68a35489587c44b851a21db53de897a1834a1b8e4083bde1dc732a17c6dcc8e17e3587d6414cae53abde5ff98c601981 WHIRLPOOL a4b182d1b9b4e12890c3c050ef0977fc84d35ca16d1a9939a500485a217ab1de2e0f0a93538d48809175f9d2699298a30f761a67ff26e6f02927dd835bd36916
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_sid.tar.gz 495466 SHA256 2b04a70fa81f752126b0983a31e9617396ee31cf72abc3994b400a968959f29d SHA512 4b28d2d7830b9d0a880ad0a3b2fd98fde722fee0a07277d97c4ef358e54f0a2e4b0c9f3aa0a066960fb1a6d308e8d42d11119dc1e2034fa163d7efde0dd93f34 WHIRLPOOL b2a7472427d1339ee7e6441c8ab6896c281e5d1504602a3230de0919f2b0893950a711e47e3093284ded1039321ddd2abd5767b8f456f89030ad9a6bffce327e
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_sk.tar.gz 1785397 SHA256 59df1ee412349ec08eb5028e17122a21529e9c4e066e94475d486d39196eab62 SHA512 b5e8a88a0c56df7c468ff9b0baac68bf3b72c34f0e3f8782d48ceb9c787249f6aac31397a8fba02dcf2f534427e27624fd4045b0ed4eea9ce86ffd5bffaa2538 WHIRLPOOL 2721a2c660597fb41e66569df5e861ccb4a5ca1070a73daee95538f3266dcbf94134a41731c80937789bc122f69b2cdcee8767008ef02b6e98f78e0e11f7b47e
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_sl.tar.gz 2164238 SHA256 2a96515ec51a5d2bc673ba054d84ba57f4f4826a4a6fffad0fea5cf62b64f692 SHA512 79168347e98d1eb739cc4a17a8b22e5cbfa5e50cd59db923d90ef4a8d415b9fe497728b789cf45fa41cd8619ce0af354beaa28ebf1f427fa29ed652a5417975b WHIRLPOOL 8c5459bafa30337caba17a93dcf6d9f1711a644369f335e4946d80a5898d95581d78dfccee281dfe1acb6b674cf5f2be9cf543d0f234e65c49b603f922232607
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_sq.tar.gz 510434 SHA256 493697c793e1c3a06b413d3521f4dd39d0411ab3ad8ae65ff512a5bd9a0d44ae SHA512 ae31726ebe1c099339a2be31e2ff6c89762083998eae77e1d8bf698c5b9f37420aeda6ce09d824680c8079b7e659cf5ecdde385765205651a3549bd11c95e9bc WHIRLPOOL a754402d6905e9423903cb5599ab6c2aa45f37ae9c240049648eae42d2fbac0258a90a85ec6d060fdfd5383fd81b6ee8d6851255205a0528126bdf413d6165bb
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_sr-Latn.tar.gz 1686972 SHA256 9463b7f5a742aa4773281028a878c800402c234ad9da8546ee29f7c0f58c5362 SHA512 c393345665560aa88440a4eee774aef2586218bbbd011dd3a002be60edfdd86c76828f73a16cf63848c9e10b9ac8cfd9af3b9aead82a01f141831edb3e457394 WHIRLPOOL 93916055ba456d3e9c51f0db5b8e5f3da8726b5b3e0fe4a960e168501dae3575f4f6d3454c263ae2cfb8e9f90a353cea21348edfb53922aa0326d8ed915bbd22
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_sr.tar.gz 1714813 SHA256 6e9fb46bdeb6cf4ccf8564c1458106ed00fa476607b546252ec9825ffc0ffebb SHA512 08e1688d5f110f21d387481662c091496cb3e6d4cc75e29c3430e71ed1b621698f542d80cacd867526a124ebe1edc1fe95d52c3c515fa1468b73acab64c59078 WHIRLPOOL a28c44de575e4bdcf944b1d1a53632abeb06f5e2b772884d70508a0be577e58dc6d11536a325c8f708d36710466740452b7bd142bac1767cc9fe62670c3c1e4d
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_ss.tar.gz 496288 SHA256 d7739fc2110e3bc90ce4bc201c3d5bb48e905facb6df0bd60867b92798b58870 SHA512 46d2f8ddbb6ef96e51cb2b8e8a1a326a996adc9d8e4b8e991f4926cc8cb0e332689280f312e360a293c6c26f13c7645b41087ce75b92a99fb34563356711ec7b WHIRLPOOL 04f59e3bb8d18b0645b9f593f7defd1eaf630f6f5b77d3ee094c203a6b3920d5358f1bc6b96cdeecb735ba60381b385393f668423ac771a8a9b7e2c939b8de6d
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_st.tar.gz 494970 SHA256 25619f7c096b8165cc505d6eac9df03bb23375e70d99a60f18bafa10070ff2b1 SHA512 dfde10db36f5e506c26dbe28471a544b2b0bdb48d9d36f4b698b827334ded5640c2d59ff679d1a7ca877d2f57fca957b20a5ea8186b659983e9ddc1396a95fdf WHIRLPOOL 51d86c30e7c3d07f0a49344b5e7261e286c7f90b3796534002c0c83b2ce5e13887f8fcea706e8cb34b7d6d4756e3f6cd8c07b02fcf27895ae80f754972eca712
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_sv.tar.gz 2367055 SHA256 572c0c7ff726c621d6128cb0d5d8d681b9bce4ffe7325d6e0aed26e6f2845b95 SHA512 ac647a19d9ebbed394dffd3529064210adc1513fc33577ea9f8c3b5a357a8b59d1d29478c3598c03cba4207e2bca2c6febd2387d45ba106488a8801ce4124ecf WHIRLPOOL 6ca4e7badf956694b5d48da3473beac1fd06247398d2de74c3e0d28caf293615d0c21e839ec591de8b44d5891182724297e4d72104e5ebfbbb245078907183ed
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_sw-TZ.tar.gz 482977 SHA256 c267696a5521781fc8612ac36f63723023ddc07c4740f2f5c08e2784fb7c265d SHA512 4b1c80434a4b5042bd00af5a1716fd0604e360563638affac6d3835837c12dd531f190e041d01471e62348bd8312a0a2916ee7a2d0fdf27e87fe05f71b091f2b WHIRLPOOL 0f733fdbbd7d7b2192ccec896115b0c593921305ff3e7b99785225b68f3fa99a04f3837251432f4de572976e37259c3d2c363fee952acb09e55bd9f2b1bce785
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_ta.tar.gz 550867 SHA256 7097d1e86d66ab84575bdef0cdf7463bacb938b7df1853850f7c7e22f3c34f44 SHA512 9066b37f016947b015a4f67ca67e165870a286fe3a43d79d9c6d2105c79a1336d351001f6b860f00c16461d741d766d32b69202d6aca0f386cebf19bfe639c21 WHIRLPOOL d243ef4f9e7cb2751b61d8ff7ad554ba1b89ba45ff7da2033fa4081ee0eb87deaf2a50b7eb88dc77044e10bda114173649626c716452637223dedbe225b2c557
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_te.tar.gz 1108686 SHA256 56c6d0900dfb2d660bfbe5e65d992e4cb4fc1813c0828f3d5fbe9304cb9bd971 SHA512 66aa1a13ee63d6a127d286fc671739998504592976252b43ad85573536267d4ea831252432cb0af06f927b7a8fcb19c2c0e98c72dbe3ca00c9886546c20d80fd WHIRLPOOL 3b509fbe8d38826f57a188a8025898c6312abe685bab26b112821ea6e9eb50a4ec007642e1d0b1ba9c2fd99f7822814e4274fbffa8d6f0ebb7ea3d5c61df95c2
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_tg.tar.gz 513738 SHA256 83bf798d510b569492d24f62ec74d9c2981d0aa7b278f8e150002682e97d5d1b SHA512 41129a9dafc9a2a6d79d9a49d86cc78bddfd480bf6e4391ea70449610d79a8dcc950c66c1d167f7fffd9ffd9cc744d16a54b8c4f6260538778cbcafe8100b34a WHIRLPOOL 4961b486ccbd7b966651ace65263bb98f0fd3d6e17758653c353388852904809ecaad920a672c8b87177075facd80de18c9b17029f29c5110dbcdb018d88c864
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_th.tar.gz 694236 SHA256 2d1a67065ad2650ce3de9068b61f4d3fc63d6089c20f63272ae3d15511d4c82c SHA512 5f613de5c281abeea4caefc3c5b8537dc18efe1ba1eba3cb5dd9d915a71c13e56d2322025c3506da4906f8db3f3f8a21a504d6e162008c17ca13d7680fc40c7c WHIRLPOOL 9be9220f6f2c9a56398d5cf8ddb14fa490988f5efeb72ebe221a151645cf5268c36d4ebcd21cc5464d046501b36b2a06372e6cd2c4f2c58fa792b51c3f376338
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_tn.tar.gz 487358 SHA256 30da2da6118ff962d730269bfd70a2c5bab1ee5b388977b8ca9be9e1338b0619 SHA512 f74188912b43d67b81a78dd533f48432d3b044bfae73fc1000d84d19af8d0f903bf8e656b39e07a0ebec6bb2a3058114d74ae5c1f603fd1ff4976d4dc2f3e680 WHIRLPOOL 03699c4bf8f0c025a267a5b45e9813ac602d34adff9a73c5c13a64357c4edc14b7d24d67f78a8e65e361c3fc4c71c6809c425d284db5ca7087ce8f5817d4acfd
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_tr.tar.gz 536244 SHA256 d8ec55a7a2c1a2d44fe95e85fd33f6825606b8115da139c414b23c29f0debc42 SHA512 9c0b5444848f925722c8547196a12da764bd8a6232af151ed70696c7b323e702acc1b16083b68dea09f22ffab2034d46653dad55645b03688b90179154515a8a WHIRLPOOL adeaa5903e99602525ab7f412bba6e972a67fb951316a59e003c197833f6c5bf373670a4a16a23a53fe5a0ce391d17ba56f9c924a1a48a4586e75646837a05c4
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_ts.tar.gz 497443 SHA256 be05666c9c1259a38f9dd86eb7e6b6d72738899dae47084df4cd0e5cfee44d89 SHA512 d4d296841ea80b1d24c1b20a0351e3124ac2e603bb7bb518553eee5d74b461077d44aca673b31548d81a136bcd7694f3b9b2a6257c404c128d891b2b4350ea6a WHIRLPOOL f81e507ce2ab03783eccbb3bf9c0f6e38b7863124e405d9c84bab935f7d2595cfbf43c41036170a60188bbe2b1655decdc73cf2be8417c4df9a6c8fe1987168c
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_tt.tar.gz 487962 SHA256 89a0659793f49d011ddbcc69ee50408a21967e2a2ab5594f9ae419c7ca4236bb SHA512 c810df70155caceae411940c9895a8035c9b8f414137b2090746773a7328953e0d749e02d9534da33a3e8f9bfc2003f8be2ac715db35aff7d5b85a90b26d0d02 WHIRLPOOL b992e4c707586740018c59a3969b187eec0b69cc2e787efa6dc46670437f8f4baffbea860cd89c4a1678213c8779b2f8c8aaeb168667fd9d9ad94e1ed0325e8a
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_ug.tar.gz 526902 SHA256 799b05e5cf3ba4ea8914340ab87b46a70e376160832b9baac45d663039591631 SHA512 abf5ee5a02e82c19850e84eca47cea9835b25a60d660711728fa4e91726bea84f485e8a54d04a50f52f41d614da1af738dc206e5a9bc7b71466296c324f5c133 WHIRLPOOL 478766319751965bd8c70f5eb3ab93856c77849f03c578c9b8d70c7bde05e4531a76b2b1ef532b2bd175ebcbc59cfdc93c0e747e4534261dd9c8b8d78cbc21cd
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_uk.tar.gz 1376217 SHA256 4a78877ef18fbb3b704e35bdc972204e4d33264bb823daced0552fd40e373d12 SHA512 54c24f2d80050db823da5b167c3096967cddf02c98bc70df90ac69208c32fab1392a4481b50f7271fd23e89cb80e5f601d06f8f20248efd04c315692b7e06982 WHIRLPOOL 349e9c28e22b7612b7e1deb018f03fda9da328d60bf86566cb379b76c5f4c8f782dc0bd1ac34e8386f1c34fcfe0954bfb713276055aae5d74e2a228b03c2f9b2
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_uz.tar.gz 488003 SHA256 07251f7bfb90c67a6dd338989c7d2956cc81a830e2a04a19e15a4c0bdbc43f8e SHA512 9e25644dd8f436a2d4f5edbe1c099c664fa9dedc888c9d8bdce1f4470666a6bc25cf33000b89817d8c642d88d2d35726e477aa54321ec88be9f6415af1cab86a WHIRLPOOL 9ce80ba2590b7420e0355b9d1e5aa4e67198170a4e5c0f94f18f4d1fb2f2c6dfaf3e14219128d2fb4121de1ac547756a15532b190d50dc073ea2b93a39fb028a
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_ve.tar.gz 498431 SHA256 ad25d8cc8b3b4d5e91754892ea0a3672e2c0e7bc45bbab069522a2fbbdfba078 SHA512 0404ed3894c0a42aebc665ea6a747bfb13e1443149beec9d0ed34bb12c6eec514673b4a326f2e5422c3c93c7c40c9c8b81de21508c5d495be67f4845cf4e7437 WHIRLPOOL 706bdcab2b66155e761cba93285766626834df9563929257dca19999591fc66b3a006f50e2f16aeac0f4713311b75323422108b3c8762af381bbdc229b3e4a14
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_vi.tar.gz 527431 SHA256 7d5ddef3d8a50df34ab2efff4cafd66d7b56cd9307f2b7ac95cb6b635eb54f9b SHA512 65c49f7f08d7b1770c14345f186cd0e3e97425c4aa2b6393d660e7bb289d7b2de9f3aaeb2402d54c448e4c6989dbcec8cde8880cf40bf5f1446afa58c6ab00b6 WHIRLPOOL 6ffd90d85204231440d06cd1620b5cb281b36865f408396febc4cc008b647baecd52605a746691294b06da6d90f4eef3edacaf48054e1341f1ac32863b73f945
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_xh.tar.gz 504315 SHA256 a14952cbe44b23ef03859321e043f13183f2298b1688328c22bd0d7f15f85e09 SHA512 bb968471aaf21835a1f84086df84247fc18fa905b76c7b89a85b4072c53974f1b116cd4dbcfd53dc2be6824940dd5e23f7097bfe10fea614b4288bcfd916236b WHIRLPOOL 73289aeccabd9a2e646cfa27099785700ba1989a4c63ce161a0370702d4d865676d1dcaff8a6ee0caa9c0e6258e80ea42ef013470c72d25e3b4691873fab9b5b
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_zh-CN.tar.gz 575863 SHA256 ed83f26fd4264a8a7f6b9ad5200a80df1a35c0022840b881906a20febc1466e7 SHA512 b988069435bd06bb7b85e09de2771ee50a35033873f30ca881a462d339821164db6c33e04d3389cd3a7ab7fe9d2568e49fa013af3791fb9edb163fd465bf21e5 WHIRLPOOL 762f7b429dc9709b63e3b92268b5ee1f2c6a456499a899789eb09cba9a930cdfaa75d90df45eafb3d4bb23256988ba333a8764a826a3260d1ad75267edfb017b
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_zh-TW.tar.gz 572775 SHA256 0ccea824f91b2f70b9337eb5b8ab2fcc5264b987f31381a05ac6f1d197693ae2 SHA512 51894f8326e2d21f36c56254c13e007e6e6949f1e7c68b3b71572a5813f8252c1e15721b706ab20a6c0c42d7d913b9e623498eb1c5b7033951dd4be2709c5f71 WHIRLPOOL 3c0b18e0527f1c750ad1befe0a9f3010ebd31aec13390648c7b95ed3abbeb9428316e1393c491182422712afb28085b4be13fedaea8dbe7741269ca82b600b78
-DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_zu.tar.gz 506160 SHA256 b5cbe78cf50776b6e6115b15d1f25f367d49a58b24b077364006089962d182a0 SHA512 e85cc67ca98e537bdae684d19bbfc70d7dda75ba602f57c983aa4ff5e8e39e5c5d9d24cd8f04e7ee07e10b757e74af6db158bcff19b79fab5825ee2c53f4c1c7 WHIRLPOOL 4eedf72373e098d1276382ca9cd2ef18debad2e97faca18de5b4514f4d3c4dda8e3e43d2bd8958dd646f2d36b13bb983cc6b87185b7ad64622cdf30a08b0fb21
 DIST LibreOffice_5.1.2.2_Linux_x86_rpm_helppack_am.tar.gz 7616805 SHA256 bdaa70c44fb26941313488fb5e75e305f916ddb3afc5e7b7f65b21a66e60150e SHA512 54f2b6b47a58f22b2c91c5f59705c0ac2c095270bb73dd5146eacb0c4e8d85eb672091916c7ca0d5facf7259c4411612db8a7b37b3708c1c4b945bb72748977e WHIRLPOOL 7a41710f743a0ed4364849aaf793e2148396d108a215c2289e86e5c10d596a394682e0317f64cce033781688b58ae4443ea7354416f05434474268ea1ed0e8db
 DIST LibreOffice_5.1.2.2_Linux_x86_rpm_helppack_ast.tar.gz 8092054 SHA256 ea0a2f94b121a0bf44a515f28c75d6f59e65a9ebbeee1764a935b1eaf627e7f4 SHA512 db84004299f4499fa085fee0732ff200063f446a7b688cae7a6e435ab22e3e7e2c75ab900523840535e254f801eaf8e961a6de738cf9fe3000ce22a78fcab106 WHIRLPOOL e6698f82d3355bdb36a1218687f1b731c7baccb3e7ef77bded63e67b5e888d35cdd245a2b9f929e9843625de5f363c3b8bc755afe2ac6c00f82e19033b3dd682
 DIST LibreOffice_5.1.2.2_Linux_x86_rpm_helppack_bg.tar.gz 8325334 SHA256 284ede03e632820e0cee436bf419f6b5c11100f255ebe4b4d2cdb9527d9d56ea SHA512 122f57902daa3e7bd53fd107a2967d8fb4ea373d59283ceb4e682c0ec96377697de3f289b4f9aa291b2385f4fb3334bbc27e07ddac6b9206ae08208a7cd4b66b WHIRLPOOL 09de43bbdf7f71abd8a199aaa4ff2d741d5a826e47c9e7878a128633e60cdfad7da927c327ca5c8b1c6d1edb40aa28a3bb74f80a0299df35939b616353b1f6de
diff --git a/app-office/libreoffice-l10n/libreoffice-l10n-5.1.1.3.ebuild b/app-office/libreoffice-l10n/libreoffice-l10n-5.1.1.3.ebuild
deleted file mode 100644
index 875cd6b0ad72..000000000000
--- a/app-office/libreoffice-l10n/libreoffice-l10n-5.1.1.3.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-inherit rpm eutils multilib versionator
-
-MY_PV=$(get_version_component_range 1-3)
-
-DESCRIPTION="Translations for the Libreoffice suite"
-HOMEPAGE="http://www.libreoffice.org"
-BASE_SRC_URI_TESTING="http://download.documentfoundation.org/${PN/-l10n/}/testing/${MY_PV}/rpm"
-BASE_SRC_URI_STABLE="http://download.documentfoundation.org/${PN/-l10n/}/stable/${MY_PV}/rpm"
-
-LICENSE="|| ( LGPL-3 MPL-1.1 )"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="offlinehelp"
-
-#
-# when changing the language lists, please be careful to preserve the spaces (bug 491728)
-#
-LANGUAGES_HELP=" am ast bg bn_IN bn bo bs ca_valencia ca cs da de dz el en_GB en en_ZA eo es et eu fi fr gl gu he hi hr hu id is it ja ka km ko mk nb ne nl nn om pl pt_BR pt ru si sk sl sq sv tg tr ug uk vi zh_CN zh_TW "
-LANGUAGES="${LANGUAGES_HELP}af ar as be br brx cy dgo fa ga gd gug kk kmr_Latn kn kok ks lb lo lt lv mai ml mn mni mr my nr nso oc or pa_IN ro rw sa_IN sat sd sid sr_Latn sr ss st sw_TZ ta te th tn ts tt uz ve xh zu "
-
-for lang in ${LANGUAGES_HELP}; do
-	helppack=""
-	[[ ${lang} == en ]] && lang2=${lang/en/en_US} || lang2=${lang}
-	helppack="offlinehelp? ( ${BASE_SRC_URI_STABLE}/x86/LibreOffice_${MY_PV}_Linux_x86_rpm_helppack_${lang2/_/-}.tar.gz -> LibreOffice_${PV}_Linux_x86_rpm_helppack_${lang2/_/-}.tar.gz  ${BASE_SRC_URI_TESTING}/x86/LibreOffice_${PV}_Linux_x86_rpm_helppack_${lang2/_/-}.tar.gz )"
-	SRC_URI+=" linguas_${lang}? ( ${helppack} )"
-done
-for lang in ${LANGUAGES}; do
-	langpack=""
-	[[ ${lang} == en ]] \
-		|| langpack="${BASE_SRC_URI_STABLE}/x86/LibreOffice_${MY_PV}_Linux_x86_rpm_langpack_${lang/_/-}.tar.gz -> LibreOffice_${PV}_Linux_x86_rpm_langpack_${lang/_/-}.tar.gz   ${BASE_SRC_URI_TESTING}/x86/LibreOffice_${PV}_Linux_x86_rpm_langpack_${lang/_/-}.tar.gz"
-	[[ -z ${langpack} ]] || SRC_URI+=" linguas_${lang}? ( ${langpack} )"
-	IUSE+=" linguas_${lang}"
-done
-unset lang helppack langpack lang2
-
-RDEPEND+="app-text/hunspell"
-
-RESTRICT="strip"
-
-S="${WORKDIR}"
-
-src_prepare() {
-	default
-
-	local lang dir rpmdir
-
-	# First remove dictionaries, we want to use system ones.
-	find "${S}" -name *dict*.rpm -delete || die "Failed to remove dictionaries"
-
-	for lang in ${LANGUAGES}; do
-		# break away if not enabled; paludis support
-		use_if_iuse linguas_${lang} || continue
-
-		dir=${lang/_/-}
-
-		# for english we provide just helppack, as translation is always there
-		if [[ ${lang} != en ]]; then
-			rpmdir="LibreOffice_${PV}_Linux_x86_rpm_langpack_${dir}/RPMS/"
-			[[ -d ${rpmdir} ]] || die "Missing directory: ${rpmdir}"
-			rpm_unpack ./${rpmdir}/*.rpm
-		fi
-		if [[ "${LANGUAGES_HELP}" =~ " ${lang} " ]] && use offlinehelp; then
-			[[ ${lang} == en ]] && dir="en-US"
-			rpmdir="LibreOffice_${PV}_Linux_x86_rpm_helppack_${dir}/RPMS/"
-			[[ -d ${rpmdir} ]] || die "Missing directory: ${rpmdir}"
-			rpm_unpack ./${rpmdir}/*.rpm
-		fi
-	done
-}
-
-src_configure() { :; }
-src_compile() { :; }
-
-src_install() {
-	local dir="${S}"/opt/${PN/-l10n/}$(get_version_component_range 1-2)/
-	# Condition required for people that do not install anything eg no linguas
-	# or just english with no offlinehelp.
-	if [[ -d "${dir}" ]] ; then
-		insinto /usr/$(get_libdir)/${PN/-l10n/}/
-		doins -r "${dir}"/*
-	fi
-	# remove extensions that are in the l10n for some weird reason
-	rm -rf "${ED}"usr/$(get_libdir)/${PN/-l10n/}/share/extensions/ || \
-		die "Failed to remove extensions"
-}
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 42f5b11e855c..133ecf4bc47c 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -5,12 +5,10 @@ DIST 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip 9796 SHA256 64585ac36a81291
 DIST 4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 555291 SHA256 b0adb8e71aef80751b999c9c055e419a625c4a05184e407aef2aee28752ad8cb SHA512 1e8a39205f21206d239871bd636f17768eb3997e08ba065c1111a537564bec2b4e97bcb2f7cd9e652a1d9b4f31cb0662010303c393aedc84b920bb5f41b27be8 WHIRLPOOL d809712c3fcaca922d64f67a14d9dc3e750ecf359687c7ba0e8c6c7fc7750e43721a21ce29d5a3b0b87b83bfe7b71947e701ba4aed0a337ec35ecbb22d8dec34
 DIST 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip 1521926 SHA256 1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753 SHA512 ec5ae23c8fe2f5efc377f7a9665039afadf28b4d8f2791379296766a5fbc9a3bf7548f9b0e3b3b07762229ec733a92ccbb69791ee0318c9c6f78f8e847253d3f WHIRLPOOL 8e446eb44188046b0e90694feba232f42c2e9f13d0f43783a18de37c94b86ff919b994931125c5d8001ecd320c1f4db5da482847304aa61646600a3bb33144b4
 DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 SHA256 75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870 SHA512 2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a WHIRLPOOL 60b98d9af2c83c0cf12a5a60ba30957d335b8b967cac07971e1edbc787b9caecd4b3c5bb480e8b38fe8109c1cf74439ebafae130c976182c2c15399f38f5d28c
+DIST ce12af00283eb90d9281956524250d6e-xmlsec1-1.2.20.tar.gz 1769329 SHA256 3221593ca50f362b546a0888a1431ad24be1470f96b2469c0e0df5e1c55e7305 SHA512 2f8d473916abf9822367edbe857fc2e12dc9858d12e790d689d787e439904bd6a452bf631043aa66e7502457ab0815a473657f58fca17a213e2490f5655e5ae5 WHIRLPOOL 29ddaef03d46fe08aa2dba200be755817f8e77de3bbbb3ed86dae65e891239f3051f79fdfadec6ae56023197e32e1c44a94385a1ce306081f3bf94be6226f8c7
 DIST d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz 16525605 SHA256 1f188ac03a8aa4663223eca8c82f91a55293d066d67127082e29a7dba1a98c9f SHA512 d08a7fe432e8df47d1d8992a45bb5f33149cb75b90eb74b2f2e457628d21a94b17eae0045096b053d2a866bf7710c775581c3e417b5dfaf66601aa18071b7305 WHIRLPOOL 95dc6ec0fb293c3538c1d51241283edf4e21647dcfd10229233ab7c3f13f7c78e6bb02c4d292a7cd2a2ec95575d775f0395e837bbc88ab4ddbaa5adfd62be2f0
-DIST fe664ba5f01ebfaeb0ab5deeb0b2249e-xmlsec1-1.2.19.tar.gz 1766298 SHA256 2fc8f7c9fadb0f6c565bf304de798a875fc719005c20169f8e88028b20c8aac0 SHA512 9d391658902e163261a61474fc0415ee0f25732dc4a98d2012459294674f7984212607febc10cdf5f5b6255932c4ad51a23d0a7b868990439812f5e276fd1a89 WHIRLPOOL 57795d4ac05727867680f7f81d50203fe7603d4a804650db7fafcbe48f8af1c5ef10a021218b3edaebc1dcc06653536f8545d2601a61e32c699701716e3353c5
 DIST libreoffice-5.0.5.2.tar.xz 167135308 SHA256 1ee729db840cf98bb00fed8c65550ccd6ced03123e3befcc511fe8df6f671b88 SHA512 f469d2faccd3e445324b0e8219a8a31b4dc8314a9b0559bfff06dd422eb6e6a9194dd4777391e71daa9bddf362cccca958defe165805f91e8334f95f36a011d2 WHIRLPOOL df4d74171c95f57a1a0fc7d25b7668abde5bb4eb8b326fd2179b4f311f5e63408919ca69bf2efe7effb2700488e11a0b4dc2059a5ce9c6a2de81d8f80314f598
-DIST libreoffice-5.1.1.3.tar.xz 175820100 SHA256 2c5afb77e10daaf02b0521f0a3027345a9cfc02fa7a152f4a2e5d7a74abc8e38 SHA512 5aa5be15732808cce56eeb9274de35c15b31b56995ebbb9dfbfc19be23798576889e7276f42cb95cf9b8b1e0f755943ceb1994525bbbaedc24a28ac3345c6fe6 WHIRLPOOL b79ded47ed673f82df2bdbe1689b8d7fe272072e797868e2712d0f5b14f3cc8cd1cc5ac6437e695e48630504d4630e4e83b3bc03a8ed6f432bfbe7707a7dd078
 DIST libreoffice-5.1.2.2.tar.xz 173763036 SHA256 54ecdc9e0201a64fb6a0898b2e5ebd6c6e22c36965e3eb797ae351219e441781 SHA512 0b2d9d2f91b40fc6eda67d9d6a16f95391f985be8ffa43e8f577c42bc0c1228e2c14de4dfbdef808a6edd61985903d5e12e0696ef43f522e78ee123c1d5f01e8 WHIRLPOOL 059f6f558c5cf3881b2ce5fee1c9ef0286c315481fd17dc7129aaf8ede97ca1759c8b821c1575ad4457e670e54241409e48e54bd1e8d62c8401cf5067ef81226
 DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 SHA256 22722121be062742624e0634beae92289c75e6a99ed507d3bf0a05c5164e3c69 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f WHIRLPOOL 1f36652a52d501d6548cfa9aa013b3e3a1867aa2b0693d2274cf7816d4aa4e0cde3c7096cc71ed47cf74e5f96da2757bf537f553021f8fd86939accb227bf538
 DIST libreoffice-help-5.0.5.2.tar.xz 1882884 SHA256 6664496d23d3e7e56dbca22b7cd9a2cf66e0e91609a20976870e0e235540c02a SHA512 63a27a160a98360d04f062c4a9b123ed0e89a4e081aaa03e50b0df7ef04c4396977401f909541a5f3510a3c2d7dbfc4c52839a1a4adc1a29bae8dd6a8056a170 WHIRLPOOL b9aae3d2f622ebb27bd9943d8111ec9c3fcfc77b35b1b93f294ed8fe7106ab001a10260c7f9ed45b5f9ca65229d15f25a3a92f6000682b6ae651c0cf16e81fed
-DIST libreoffice-help-5.1.1.3.tar.xz 1904764 SHA256 ce5df97b26d25bf73cf29f122f9f453ca54055ce37a8bb3dc25e4c298b5d3da9 SHA512 2d2400850e0e734df8eb884df2edfabd6dd31c1ef8f43652feca3cc573c1acf6d73716eadf3ded39e2b15f010ec486835830f020aec7b47529064d5cdab4fde0 WHIRLPOOL 1a39adf1b424876b58a5ad8c3e3e625c0e54ad525d93d309698fed33549c40cae00543311f68fe22e39b9f871587811b6867633e741724d61e994d6ad8518cb2
 DIST libreoffice-help-5.1.2.2.tar.xz 1900736 SHA256 dc4d9fd6ca78ad89069ca1f0187f274c9cd83fb8849716193d25bce6ca072953 SHA512 5868e9ec51ac841372cdc8aa7b257082d04269ecd3c2724ddd9f6da36a1a0549eb6bedc2e71a205543f8a23b36df7cebd937a316b22c2be778a1d2f7e4d9df41 WHIRLPOOL c7565974995b4a95894b59263595f82c6980c2c8e4b3aa37fb787c4ad369774b128062a32dcf14c4f1dc60339c469e47acc9ba3b193ea6e2de6a1d4e38cc21a6
diff --git a/app-office/libreoffice/files/libreoffice-5.1.0.3-isnan.patch b/app-office/libreoffice/files/libreoffice-5.1.0.3-isnan.patch
deleted file mode 100644
index 6a15da565afb..000000000000
--- a/app-office/libreoffice/files/libreoffice-5.1.0.3-isnan.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: Tomáš Chvátal <tchvatal@suse.com>
-Date: Thu, 25 Feb 2016 16:16:19 +0000 (+0100)
-Subject: Add std prefix to isnan check to fix build with glibc > 2.23
-X-Git-Url: https://gerrit.libreoffice.org/gitweb?p=core.git;a=commitdiff_plain;h=d7c64d6e430e9640c77c846006a13bbc78704c28
-
-Add std prefix to isnan check to fix build with glibc > 2.23
-
-Change-Id: I6321cd905152231bb013e25f7b268f85453fe917
----
-
-diff --git a/xmloff/source/draw/ximp3dscene.cxx b/xmloff/source/draw/ximp3dscene.cxx
-index 5cf205f..525e2fb 100644
---- a/xmloff/source/draw/ximp3dscene.cxx
-+++ b/xmloff/source/draw/ximp3dscene.cxx
-@@ -66,7 +66,7 @@ SdXML3DLightContext::SdXML3DLightContext(
-             {
-                 ::basegfx::B3DVector aVal;
-                 SvXMLUnitConverter::convertB3DVector(aVal, sValue);
--                if (!isnan(aVal.getX()) && !isnan(aVal.getY()) && !isnan(aVal.getZ()))
-+                if (!std::isnan(aVal.getX()) && !std::isnan(aVal.getY()) && !std::isnan(aVal.getZ()))
-                 {
-                     maDirection = aVal;
-                 }
diff --git a/app-office/libreoffice/files/libreoffice-5.1.1.3-gtk3.patch b/app-office/libreoffice/files/libreoffice-5.1.1.3-gtk3.patch
deleted file mode 100644
index 539ef7e1f3fe..000000000000
--- a/app-office/libreoffice/files/libreoffice-5.1.1.3-gtk3.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From e451b03e8c21ad23cb1abfd6dd68b6d1e8188121 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
-Date: Mon, 7 Mar 2016 13:19:55 +0000
-Subject: gtktiledviewer needs gtk3 not gtk2
-
-Change-Id: Iede2008139cb570ff65202762e92f6694548a065
-
-diff --git a/Repository.mk b/Repository.mk
-index e9cd89a..423d58b 100644
---- a/Repository.mk
-+++ b/Repository.mk
-@@ -68,13 +68,13 @@ $(eval $(call gb_Helper_register_executables,NONE, \
-         svptest \
-         svpclient \
-         pixelctl ) \
--	$(if $(and $(ENABLE_GTK), $(filter LINUX %BSD SOLARIS,$(OS))), tilebench) \
-+	$(if $(and $(ENABLE_GTK3), $(filter LINUX %BSD SOLARIS,$(OS))), tilebench) \
- 	$(if $(filter LINUX MACOSX SOLARIS WNT %BSD,$(OS)),icontest \
- 	    outdevgrind) \
- 	vcldemo \
- 	tiledrendering \
-     mtfdemo \
--	$(if $(and $(ENABLE_GTK), $(filter LINUX %BSD SOLARIS,$(OS))), gtktiledviewer) \
-+	$(if $(and $(ENABLE_GTK3), $(filter LINUX %BSD SOLARIS,$(OS))), gtktiledviewer) \
- ))
- 
- $(eval $(call gb_Helper_register_executables_for_install,SDK,sdk, \
--- 
-cgit v0.10.2
-
diff --git a/app-office/libreoffice/libreoffice-5.1.1.3.ebuild b/app-office/libreoffice/libreoffice-5.1.1.3.ebuild
deleted file mode 100644
index 5abaa476e404..000000000000
--- a/app-office/libreoffice/libreoffice-5.1.1.3.ebuild
+++ /dev/null
@@ -1,596 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_REQUIRED="optional"
-QT_MINIMAL="4.7.4"
-KDE_SCM="git"
-CMAKE_REQUIRED="never"
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-PYTHON_REQ_USE="threads,xml"
-
-# experimental ; release ; old
-# Usually the tarballs are moved a lot so this should make
-# everyone happy.
-DEV_URI="
-	http://dev-builds.libreoffice.org/pre-releases/src
-	http://download.documentfoundation.org/libreoffice/src/${PV:0:5}/
-	http://download.documentfoundation.org/libreoffice/old/${PV}/
-"
-EXT_URI="http://ooo.itc.hu/oxygenoffice/download/libreoffice"
-ADDONS_URI="http://dev-www.libreoffice.org/src/"
-
-BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
-# PATCHSET="${P}-patchset-01.tar.xz"
-
-[[ ${PV} == *9999* ]] && SCM_ECLASS="git-r3"
-inherit multiprocessing autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic versionator ${SCM_ECLASS}
-unset SCM_ECLASS
-
-DESCRIPTION="A full office productivity suite"
-HOMEPAGE="http://www.libreoffice.org"
-SRC_URI="branding? ( http://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
-[[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}"
-
-# Split modules following git/tarballs
-# Core MUST be first!
-# Help is used for the image generator
-MODULES="core help"
-# Only release has the tarballs
-if [[ ${PV} != *9999* ]]; then
-	for i in ${DEV_URI}; do
-		for mod in ${MODULES}; do
-			if [[ ${mod} == core ]]; then
-				SRC_URI+=" ${i}/${P}.tar.xz"
-			else
-				SRC_URI+=" ${i}/${PN}-${mod}-${PV}.tar.xz"
-			fi
-		done
-		unset mod
-	done
-	unset i
-fi
-unset DEV_URI
-
-# Really required addons
-# These are bundles that can't be removed for now due to huge patchsets.
-# If you want them gone, patches are welcome.
-ADDONS_SRC=(
-	"${ADDONS_URI}/d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz"
-	"${ADDONS_URI}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz" # modifies source code
-	"collada? ( ${ADDONS_URI}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 )"
-	"java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
-	# no release for 8 years, should we package it?
-	"libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
-	# Does not build with 1.6 rhino at all
-	"libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
-	# requirement of rhino
-	"libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
-	# not packageable
-	"odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
-)
-SRC_URI+=" ${ADDONS_SRC[*]}"
-
-unset ADDONS_URI
-unset EXT_URI
-unset ADDONS_SRC
-
-IUSE="bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome gstreamer
-+gtk gtk3 jemalloc kde libressl mysql odk postgres telepathy test vlc"
-
-LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
-# Unpackaged separate extensions:
-# diagram: lo has 0.9.5 upstream is weirdly patched 0.9.4 -> wtf?
-# hunart: only on ooo extensions -> fubared download path somewhere on sf
-# numbertext, typo, validator, watch-window: ^^
-# oooblogger: no homepage or anything
-# Extensions that need extra work:
-for lo_xt in ${LO_EXTS}; do
-	IUSE+=" libreoffice_extensions_${lo_xt}"
-done
-unset lo_xt
-
-LICENSE="|| ( LGPL-3 MPL-1.1 )"
-SLOT="0"
-[[ ${PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-
-COMMON_DEPEND="
-	${PYTHON_DEPS}
-	app-arch/zip
-	app-arch/unzip
-	>=app-text/hunspell-1.3.2-r3
-	app-text/mythes
-	>=app-text/libabw-0.1.0
-	>=app-text/libexttextcat-3.4.4
-	>=app-text/libebook-0.1
-	>=app-text/libetonyek-0.1
-	app-text/liblangtag
-	>=app-text/libmspub-0.1.0
-	>=app-text/libmwaw-0.3.1
-	>=app-text/libodfgen-0.1.0
-	app-text/libwpd:0.10[tools]
-	app-text/libwpg:0.3
-	>=app-text/libwps-0.4
-	>=app-text/poppler-0.16:=[cxx]
-	>=dev-cpp/clucene-2.3.3.4-r2
-	=dev-cpp/libcmis-0.5*
-	dev-db/unixODBC
-	>=dev-libs/boost-1.55:=
-	dev-libs/expat
-	>=dev-libs/hyphen-2.7.1
-	>=dev-libs/icu-4.8.1.1:=
-	=dev-libs/liborcus-0.9*
-	>=dev-libs/librevenge-0.0.1
-	>=dev-libs/nspr-4.8.8
-	>=dev-libs/nss-3.12.9
-	>=dev-lang/perl-5.0
-	!libressl? ( >=dev-libs/openssl-1.0.0d:0 )
-	libressl? ( dev-libs/libressl )
-	>=dev-libs/redland-1.0.16
-	media-gfx/graphite2
-	>=media-libs/fontconfig-2.8.0
-	media-libs/freetype:2
-	>=media-libs/glew-1.10
-	>=media-libs/harfbuzz-0.9.18:=[icu(+)]
-	media-libs/lcms:2
-	>=media-libs/libpng-1.4:0=
-	>=media-libs/libcdr-0.1.0
-	>=media-libs/libfreehand-0.1.0
-	media-libs/libpagemaker
-	>=media-libs/libvisio-0.1.0
-	>=net-misc/curl-7.21.4
-	net-libs/neon
-	net-nds/openldap
-	sci-mathematics/lpsolve
-	virtual/jpeg:0
-	>=x11-libs/cairo-1.10.0[X,-xlib-xcb]
-	x11-libs/libXinerama
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	virtual/glu
-	virtual/opengl
-	bluetooth? ( net-wireless/bluez )
-	coinmp? ( sci-libs/coinor-mp )
-	collada? ( >=media-libs/opencollada-1.2.2_p20150207 )
-	cups? ( net-print/cups )
-	dbus? ( >=dev-libs/dbus-glib-0.92 )
-	eds? (
-		dev-libs/glib:2
-		gnome-extra/evolution-data-server
-	)
-	firebird? ( >=dev-db/firebird-2.5 )
-	gltf? ( media-libs/libgltf )
-	gtk? (
-		x11-libs/gdk-pixbuf[X]
-		>=x11-libs/gtk+-2.24:2
-	)
-	gtk3? (
-		dev-libs/glib:2
-		dev-libs/gobject-introspection
-		>=x11-libs/gtk+-3.8:3
-	)
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-	)
-	jemalloc? ( dev-libs/jemalloc )
-	libreoffice_extensions_scripting-beanshell? ( >=dev-java/bsh-2.0_beta4 )
-	libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
-	mysql? ( >=dev-db/mysql-connector-c++-1.1.0 )
-	postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
-	telepathy? ( >=net-libs/telepathy-glib-0.18.0 )
-"
-
-RDEPEND="${COMMON_DEPEND}
-	!app-office/libreoffice-bin
-	!app-office/libreoffice-bin-debug
-	!<app-office/openoffice-bin-3.4.0-r1
-	!app-office/openoffice
-	media-fonts/libertine
-	media-fonts/liberation-fonts
-	media-fonts/urw-fonts
-	java? ( >=virtual/jre-1.6 )
-	kde? ( $(add_kdeapps_dep kioclient) )
-	vlc? ( media-video/vlc )
-"
-
-if [[ ${PV} != *9999* ]]; then
-	PDEPEND="=app-office/libreoffice-l10n-$(get_version_component_range 1-2)*"
-else
-	# Translations are not reliable on live ebuilds
-	# rather force people to use english only.
-	PDEPEND="!app-office/libreoffice-l10n"
-fi
-
-# FIXME: cppunit should be moved to test conditional
-#        after everything upstream is under gbuild
-#        as dmake execute tests right away
-DEPEND="${COMMON_DEPEND}
-	>=dev-libs/libatomic_ops-7.2d
-	>=dev-libs/libxml2-2.7.8
-	dev-libs/libxslt
-	dev-perl/Archive-Zip
-	dev-util/cppunit
-	>=dev-util/gperf-3
-	dev-util/intltool
-	>=dev-util/mdds-0.12.0:0=
-	media-libs/glm
-	net-misc/npapi-sdk
-	sys-devel/bison
-	sys-devel/flex
-	sys-devel/gettext
-	!<sys-devel/make-3.82
-	sys-devel/ucpp
-	sys-libs/zlib
-	virtual/pkgconfig
-	x11-libs/libXt
-	x11-libs/libXtst
-	x11-proto/randrproto
-	x11-proto/xextproto
-	x11-proto/xineramaproto
-	x11-proto/xproto
-	java? (
-		>=virtual/jdk-1.6
-		>=dev-java/ant-core-1.7
-	)
-	odk? ( >=app-doc/doxygen-1.8.4 )
-	test? ( dev-util/cppunit )
-"
-
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	bluetooth? ( dbus )
-	collada? ( gltf )
-	eds? ( gnome )
-	gnome? ( gtk )
-	telepathy? ( gtk )
-	libreoffice_extensions_nlpsolver? ( java )
-	libreoffice_extensions_scripting-beanshell? ( java )
-	libreoffice_extensions_scripting-javascript? ( java )
-	libreoffice_extensions_wiki-publisher? ( java )
-"
-
-PATCHES=(
-	# submitted upstream
-	"${FILESDIR}/${PN}-5.1.0.3-isnan.patch"
-
-	# taken from 5.1 branch
-	"${FILESDIR}/${PN}-5.1.1.3-gtk3.patch" # Gentoo bug 575732
-
-	# not upstreamable stuff
-	"${FILESDIR}/${PN}-4.4-system-pyuno.patch"
-)
-
-CHECKREQS_MEMORY="512M"
-
-if [[ ${MERGE_TYPE} != binary ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
-	CHECKREQS_DISK_BUILD="22G"
-elif [[ ${MERGE_TYPE} != binary ]] ; then
-	CHECKREQS_DISK_BUILD="6G"
-fi
-
-pkg_pretend() {
-	local pgslot
-
-	use java || \
-		ewarn "If you plan to use lbase application you should enable java or you will get various crashes."
-
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		check-reqs_pkg_pretend
-
-		if [[ $(gcc-major-version) -lt 4 ]] || {
-			[[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]]; }
-		then
-			eerror "Compilation with gcc older than 4.7 is not supported"
-			die "Too old gcc found."
-		fi
-	fi
-
-	# Ensure pg version but we have to be sure the pg is installed (first
-	# install on clean system)
-	if use postgres && has_version dev-db/postgresql; then
-		 pgslot=$(postgresql-config show)
-		 if [[ ${pgslot//.} -lt 90 ]] ; then
-			eerror "PostgreSQL slot must be set to 9.0 or higher."
-			eerror "    postgresql-config set 9.0"
-			die "PostgreSQL slot is not set to 9.0 or higher."
-		 fi
-	fi
-}
-
-pkg_setup() {
-	java-pkg-opt-2_pkg_setup
-	kde4-base_pkg_setup
-	python-single-r1_pkg_setup
-
-	[[ ${MERGE_TYPE} != binary ]] && check-reqs_pkg_setup
-}
-
-src_unpack() {
-	local mod
-
-	[[ -n ${PATCHSET} ]] && unpack ${PATCHSET}
-	use branding && unpack "${BRANDING}"
-
-	if [[ ${PV} != *9999* ]]; then
-		unpack "${P}.tar.xz"
-		for mod in ${MODULES}; do
-			[[ ${mod} == core ]] && continue
-			unpack "${PN}-${mod}-${PV}.tar.xz"
-		done
-	else
-		local base_uri branch checkout mypv
-		base_uri="git://anongit.freedesktop.org"
-		for mod in ${MODULES}; do
-			branch="master"
-			mypv=${PV/.9999}
-			[[ ${mypv} != ${PV} ]] && branch="${PN}-${mypv/./-}"
-			git-r3_fetch "${base_uri}/${PN}/${mod}" "refs/heads/${branch}"
-			[[ ${mod} != core ]] && checkout="${S}/${mod}"
-			[[ ${mod} == help ]] && checkout="helpcontent2" # doesn't match on help
-			git-r3_checkout "${base_uri}/${PN}/${mod}" ${checkout}
-		done
-	fi
-}
-
-src_prepare() {
-	# patchset
-	if [[ -n ${PATCHSET} ]]; then
-		EPATCH_FORCE="yes" \
-		EPATCH_SOURCE="${WORKDIR}/${PATCHSET/.tar.xz/}" \
-		EPATCH_SUFFIX="patch" \
-		epatch
-	fi
-
-	epatch "${PATCHES[@]}"
-	epatch_user
-
-	AT_M4DIR="m4" eautoreconf
-	# hack in the autogen.sh
-	touch autogen.lastrun
-
-	# system pyuno mess
-	sed -i \
-		-e "s:%eprefix%:${EPREFIX}:g" \
-		-e "s:%libdir%:$(get_libdir):g" \
-		pyuno/source/module/uno.py \
-		pyuno/source/officehelper.py || die
-	# sed in the tests
-	sed -i \
-		-e "s#all : build unitcheck#all : build#g" \
-		solenv/gbuild/Module.mk || die
-	sed -i \
-		-e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
-		-e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
-		Makefile.in || die
-
-	if use branding; then
-		# hack...
-		mv -v "${WORKDIR}/branding-intro.png" "${S}/icon-themes/galaxy/brand/intro.png" || die
-	fi
-}
-
-src_configure() {
-	local java_opts
-	local internal_libs
-	local lo_ext
-	local ext_opts
-
-	# optimization flags
-	export GMAKE_OPTIONS="${MAKEOPTS}"
-	# System python enablement:
-	export PYTHON_CFLAGS=$(python_get_CFLAGS)
-	export PYTHON_LIBS=$(python_get_LIBS)
-
-	if use collada; then
-		export OPENCOLLADA_CFLAGS="-I/usr/include/opencollada/COLLADABaseUtils -I/usr/include/opencollada/COLLADAFramework -I/usr/include/opencollada/COLLADASaxFrameworkLoader -I/usr/include/opencollada/GeneratedSaxParser"
-		export OPENCOLLADA_LIBS="-L /usr/$(get_libdir)/opencollada -lOpenCOLLADABaseUtils -lOpenCOLLADAFramework -lOpenCOLLADASaxFrameworkLoader -lGeneratedSaxParser"
-	fi
-
-	# sane: just sane.h header that is used for scan in writer, not
-	#       linked or anything else, worthless to depend on
-	# vigra: just uses templates from there
-	#        it is serious pain in the ass for packaging
-	#        should be replaced by boost::gil if someone interested
-	internal_libs+="
-		--without-system-sane
-		--without-system-vigra
-	"
-
-	# libreoffice extensions handling
-	for lo_xt in ${LO_EXTS}; do
-		if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
-			ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt})"
-		else
-			ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt})"
-		fi
-	done
-
-	if use java; then
-		# hsqldb: system one is too new
-		java_opts="
-			--without-junit
-			--without-system-hsqldb
-			--with-ant-home="${ANT_HOME}"
-			--with-jdk-home=$(java-config --jdk-home 2>/dev/null)
-			--with-jvm-path="${EPREFIX}/usr/lib/"
-		"
-
-		use libreoffice_extensions_scripting-beanshell && \
-			java_opts+=" --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar)"
-
-		use libreoffice_extensions_scripting-javascript && \
-			java_opts+=" --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar)"
-	fi
-
-	# system headers/libs/...: enforce using system packages
-	# --enable-cairo: ensure that cairo is always required
-	# --enable-graphite: disabling causes build breakages
-	# --enable-*-link: link to the library rather than just dlopen on runtime
-	# --enable-release-build: build the libreoffice as release
-	# --disable-fetch-external: prevent dowloading during compile phase
-	# --disable-systray: quickstarter does not actually work at all so do not
-	#   promote it
-	# --enable-extension-integration: enable any extension integration support
-	# --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
-	# --disable-report-builder: too much java packages pulled in without pkgs
-	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}/" \
-		--with-system-headers \
-		--with-system-libs \
-		--with-system-jars \
-		--with-system-dicts \
-		--enable-cairo-canvas \
-		--enable-graphite \
-		--enable-largefile \
-		--enable-mergelibs \
-		--enable-neon \
-		--enable-python=system \
-		--enable-randr \
-		--enable-randr-link \
-		--enable-release-build \
-		--disable-hardlink-deliver \
-		--disable-ccache \
-		--disable-crashdump \
-		--disable-dependency-tracking \
-		--disable-epm \
-		--disable-fetch-external \
-		--disable-gstreamer-0-10 \
-		--disable-report-builder \
-		--disable-online-update \
-		--disable-systray \
-		--with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") \
-		--with-build-version="Gentoo official package" \
-		--enable-extension-integration \
-		--with-external-dict-dir="${EPREFIX}/usr/share/myspell" \
-		--with-external-hyph-dir="${EPREFIX}/usr/share/myspell" \
-		--with-external-thes-dir="${EPREFIX}/usr/share/myspell" \
-		--with-external-tar="${DISTDIR}" \
-		--with-lang="" \
-		--with-parallelism=$(makeopts_jobs) \
-		--with-system-ucpp \
-		--with-vendor="Gentoo Foundation" \
-		--with-x \
-		--without-fonts \
-		--without-myspell-dicts \
-		--without-help \
-		--with-helppack-integration \
-		--without-sun-templates \
-		$(use_enable bluetooth sdremote-bluetooth) \
-		$(use_enable coinmp) \
-		$(use_enable collada) \
-		$(use_enable cups) \
-		$(use_enable debug) \
-		$(use_enable dbus) \
-		$(use_enable eds evolution2) \
-		$(use_enable firebird firebird-sdbc) \
-		$(use_enable gltf) \
-		$(use_enable gnome gio) \
-		$(use_enable gstreamer gstreamer-1-0) \
-		$(use_enable gtk) \
-		$(use_enable gtk3) \
-		$(use_enable kde kde4) \
-		$(use_enable mysql ext-mariadb-connector) \
-		$(use_enable odk) \
-		$(use_enable postgres postgresql-sdbc) \
-		$(use_enable telepathy) \
-		$(use_enable vlc) \
-		$(use_with coinmp system-coinmp) \
-		$(use_with collada system-opencollada) \
-		$(use_with gltf system-libgltf) \
-		$(use_with java) \
-		$(use_with mysql system-mysql-cppconn) \
-		$(use_with odk doxygen) \
-		${internal_libs} \
-		${java_opts} \
-		${ext_opts}
-}
-
-src_compile() {
-	# more and more LO stuff tries to use OpenGL, including tests during build
-	# bug 501508, bug 540624, bug 545974 and probably more
-	addpredict /dev/dri
-	addpredict /dev/ati
-	addpredict /dev/nvidiactl
-
-	# hack for offlinehelp, this needs fixing upstream at some point
-	# it is broken because we send --without-help
-	# https://bugs.freedesktop.org/show_bug.cgi?id=46506
-	(
-		grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk" || die
-		source "${T}/config_host.mk" 2&> /dev/null
-
-		local path="${WORKDIR}/helpcontent2/source/auxiliary/"
-		mkdir -p "${path}" || die
-
-		echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=icon-themes/galaxy/res/helpimg > \"${path}/helpimg.ilst\""
-		perl "${S}/helpcontent2/helpers/create_ilst.pl" \
-			-dir=icon-themes/galaxy/res/helpimg \
-			> "${path}/helpimg.ilst"
-		[[ -s "${path}/helpimg.ilst" ]] || \
-			ewarn "The help images list is empty, something is fishy, report a bug."
-	)
-
-	local target
-	use test && target="build" || target="build-nocheck"
-
-	# this is not a proper make script
-	make ${target} || die
-}
-
-src_test() {
-	make unitcheck || die
-	make slowcheck || die
-}
-
-src_install() {
-	# This is not Makefile so no buildserver
-	make DESTDIR="${D}" distro-pack-install -o build -o check || die
-
-	# Fix bash completion placement
-	newbashcomp "${ED}"etc/bash_completion.d/libreoffice.sh ${PN}
-	bashcomp_alias \
-		libreoffice \
-		unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
-	rm -rf "${ED}"etc/ || die
-
-	if use branding; then
-		insinto /usr/$(get_libdir)/${PN}/program
-		newins "${WORKDIR}/branding-sofficerc" sofficerc
-		dodir /etc/env.d
-		echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"etc/env.d/99${PN} || die
-	fi
-
-	# Hack for offlinehelp, this needs fixing upstream at some point.
-	# It is broken because we send --without-help
-	# https://bugs.freedesktop.org/show_bug.cgi?id=46506
-	insinto /usr/$(get_libdir)/libreoffice/help
-	doins xmlhelp/util/*.xsl
-
-	# Remove desktop files for support to old installs that can't parse mime
-	rm -r "${ED}"usr/share/mimelnk/ || die
-
-	# FIXME: Hack add missing file
-	exeinto /usr/$(get_libdir)/${PN}/program
-	doexe "${S}"/instdir/program/libsaxlo.so
-
-	pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/soffice.bin
-	pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/unopkg.bin
-}
-
-pkg_preinst() {
-	# Cache updates - all handled by kde eclass for all environments
-	kde4-base_pkg_preinst
-}
-
-pkg_postinst() {
-	kde4-base_pkg_postinst
-}
-
-pkg_postrm() {
-	kde4-base_pkg_postrm
-}
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index f07ecf8ebaa2..91f2789ec725 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -59,7 +59,7 @@ unset DEV_URI
 # These are bundles that can't be removed for now due to huge patchsets.
 # If you want them gone, patches are welcome.
 ADDONS_SRC=(
-	"${ADDONS_URI}/fe664ba5f01ebfaeb0ab5deeb0b2249e-xmlsec1-1.2.19.tar.gz" # modifies source code
+	"${ADDONS_URI}/ce12af00283eb90d9281956524250d6e-xmlsec1-1.2.20.tar.gz" # modifies source code
 	"collada? ( ${ADDONS_URI}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 )"
 	"java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
 	# no release for 8 years, should we package it?
diff --git a/app-portage/portage-utils/portage-utils-0.63.ebuild b/app-portage/portage-utils/portage-utils-0.63.ebuild
index 257322d4ffaf..3db85b515a48 100644
--- a/app-portage/portage-utils/portage-utils-0.63.ebuild
+++ b/app-portage/portage-utils/portage-utils-0.63.ebuild
@@ -22,6 +22,7 @@ DEPEND="${RDEPEND}
 	static? ( dev-libs/iniparser:0[static-libs] )"
 
 src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.61-solaris.patch
 	epatch_user
 }
 
diff --git a/app-text/blogc/Manifest b/app-text/blogc/Manifest
index b5a8a9490c64..9f7cc02a5589 100644
--- a/app-text/blogc/Manifest
+++ b/app-text/blogc/Manifest
@@ -1 +1 @@
-DIST blogc-0.8.0.tar.xz 270760 SHA256 2f081fee25e7270e3fe3ce6e8a87365449cb5f15f2188154b249c5d5bb8f561c SHA512 ab3a07ae90b5d26ef7bd9c151785e05b1a8d469cffacdd62d34d8dd22170db002aa37d946717ed181f9f053d982e741084c0ce97e8d7a207d16c30629babbafe WHIRLPOOL 90ebdf8c49d2547b9cbd0d7925e843216424e5c0d179e18c4464a90a5a65c224e7bd28a09f7cea271cc8426943140d2ad41714405f6ca23087936ca6d90a5a60
+DIST blogc-0.8.1.tar.xz 270704 SHA256 06b9367ff6992a0aac447d74b1df13c35f58f7ac06ee331260462ce3a402864f SHA512 2a8f00401a3f119532dfadde5bf62f455ea229fab75ca5219493aec7cc502a29e62226e88a663441f317b065053284dd78303bd8c423aff5d46cff20c3a2c6d7 WHIRLPOOL f68aa583780d7b4a1b7dc97c9bf617792780322fc766bfa2bc45f74965e1f98a7d7161bd2175b0d68c2564e3914e24513db603b7dd0f0e99979cb816cd4a0ac8
diff --git a/app-text/blogc/blogc-0.8.0.ebuild b/app-text/blogc/blogc-0.8.1.ebuild
similarity index 100%
rename from app-text/blogc/blogc-0.8.0.ebuild
rename to app-text/blogc/blogc-0.8.1.ebuild
diff --git a/app-text/libabw/libabw-0.1.1.ebuild b/app-text/libabw/libabw-0.1.1.ebuild
index e11dd9b388d0..8eb57d3dc0e2 100644
--- a/app-text/libabw/libabw-0.1.1.ebuild
+++ b/app-text/libabw/libabw-0.1.1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
-inherit base eutils
+inherit autotools eutils
 
 DESCRIPTION="Library parsing abiword documents"
 HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/${PN}"
@@ -34,6 +34,11 @@ PATCHES=(
 	"${FILESDIR}/${PN}-0.1.1-boost-1.59.patch"
 )
 
+src_prepare() {
+	default
+	eautoreconf
+}
+
 src_configure() {
 	econf \
 		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
diff --git a/app-vim/vim-rest-console/Manifest b/app-vim/vim-rest-console/Manifest
index 216bb2e7bf55..e219da819f2d 100644
--- a/app-vim/vim-rest-console/Manifest
+++ b/app-vim/vim-rest-console/Manifest
@@ -1 +1,2 @@
 DIST vim-rest-console-2.3.0.tar.gz 11584 SHA256 e3d07527a41f03eeffc82f12e1de43865f36f7348e4bf99fc4e2af55b234a74a SHA512 04fa4cc2177b87a6d69ad50d0e45f411169d178e4990280afde730c461cb718acd09dc034e61c51f73974369d9be9300281f1e60adf8084730977caa27c65da2 WHIRLPOOL 93b5bc602361a2abe845a688b0e8c22cc7c3e3d6dd671f37e8d576f9d3c06ebaea3da58ac2838634a7219dd6fe1a56cc666d3a076e799bad1cae2636996371e9
+DIST vim-rest-console-2.4.0.tar.gz 11795 SHA256 011e1166f9e8f5831a0288640952d962ab9190cb02c54b8947354049d7146028 SHA512 77f06a9cee534eda2e414c4b0b0fdbdf335b1a397ab9c45b4331f211db1dbeb89bd0a73906945b0ed08c8b795c4be444b9ffcd2c06e145a43b3efb456aa64666 WHIRLPOOL 1b44987d3645a6d16243006f428c66b3d9f980a358865aab644631a5650a330ed38e266ac9d0c2084a3f1d9a10490202be6a45a2af2455e40558e66826643dee
diff --git a/app-vim/vim-rest-console/vim-rest-console-2.4.0.ebuild b/app-vim/vim-rest-console/vim-rest-console-2.4.0.ebuild
new file mode 100644
index 000000000000..2e912a0c7894
--- /dev/null
+++ b/app-vim/vim-rest-console/vim-rest-console-2.4.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit vim-plugin
+
+DESCRIPTION="a REST console for vim"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=5182 https://github.com/diepm/vim-rest-console"
+SRC_URI="https://github.com/diepm/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
+
+RDEPEND="net-misc/curl"
+
+src_prepare() {
+	rm *.md *.json *.rest || die
+}
diff --git a/dev-cpp/glibmm/Manifest b/dev-cpp/glibmm/Manifest
index b1c5987bc739..c0fd1cb04186 100644
--- a/dev-cpp/glibmm/Manifest
+++ b/dev-cpp/glibmm/Manifest
@@ -1,4 +1,3 @@
 DIST glibmm-2.44.0.tar.xz 6102664 SHA256 1b0ac0425d24895507c0e0e8088a464c7ae2d289c47afa1c11f63278fc672ea8 SHA512 4a932b127ce0ed0798cef3555fdd1ca1632fc10720b74f9a39626989c216542807d76ae67ebc980049b65b1c163d236fc9875506ca2d80584c724394bbb8bfd7 WHIRLPOOL d1fad56af4487e661398ec3be006c528c5c6c1cba0181ad08725f14cb94bbbfe2f9c20870722b90ebca61a51e9959eee89b1f92a7f00f99bc3a573b123360197
-DIST glibmm-2.46.1.tar.xz 6470952 SHA256 9647e596c1081d2ea202bd3da2824ec2ea359498fa86eb59a55b1b307dd8c4aa SHA512 4209264ec40e8894d3b4876f65af1458b6a15e22e3069058bf7f32854b5150a1890359cee878d29de94f609e423dc6f8467cffbbecf4a30d5810c890ad40b981 WHIRLPOOL 909a283d06e45e6d4077f0058eaa884acc268a93d97d80009f81cd91f3b8e73dd0016e7071797a1e9e95775752673fd6b47e295c58338052a0976054278964e7
-DIST glibmm-2.46.2.tar.xz 6471124 SHA256 7221a01a768c1cce2bb994cb6ebfe634246dba4788f910484d04e3b0d903a3c8 SHA512 f6748c6833c5733784ade3a28bcb72131bc5f1d291250094b51cf3676974f80f1d1616cb77c7b77b59fbdcd15cc692210caf27ecf1eaa5a3498042499a060ff1 WHIRLPOOL 9038724f9f9a63415126cbaf8946f31cea11d082c69d2c53bf24ec17f11e2266ca7a8ffa480f02a8a7706626cf5bb8fb4624615272a476b3cca0dec096d1be55
 DIST glibmm-2.46.3.tar.xz 6470984 SHA256 c78654addeb27a1213bedd7cd21904a45bbb98a5ba2f2f0de2b2f1a5682d86cf SHA512 24e112edd2bb6d2cf05a275d2ee781a4921f408dbb7fd317259c3303a993845a40f2e3e3fbaa819b88f718e25c30f02ad32695767eb6688a90389aea961b1a66 WHIRLPOOL e390fad02e5c254097b69302905a09d13c7abc6bcf3ca623b948de54004f601884397b7381c2b51d913879d2872a58d519249ba6af10dab3b0728dca013a6ad7
+DIST glibmm-2.46.4.tar.xz 6473200 SHA256 bfec03899e49305f3c235025c676f3bc16602af7a62f2baaa6a9d0e358884b4d SHA512 871245b23307b7feb041d8964bc764622bb4aa1c6d879e06ffcafbe1bf8f14fae18d8d304c806114ac952a6ee0da8189f8d4cb9956d6059dab647d97b119ae4d WHIRLPOOL ca9d44ba39e90204e9ce6adcbd46f06df0ea82ab7687dc38f72f4f72b75e2550aa6e75a568e9fbe51e83babe6b7e5403facab608bd095d14bd33f4336282f145
diff --git a/dev-cpp/glibmm/files/glibmm-2.46.2-use-noexcept.patch b/dev-cpp/glibmm/files/glibmm-2.46.2-use-noexcept.patch
deleted file mode 100644
index 085441d96679..000000000000
--- a/dev-cpp/glibmm/files/glibmm-2.46.2-use-noexcept.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 6c7c14875d0f1d249abcccb0033297c8d48619dc Mon Sep 17 00:00:00 2001
-From: Murray Cumming <murrayc@murrayc.com>
-Date: Sun, 29 Nov 2015 21:32:46 +0100
-Subject: Gio::Application: Destructor: Use noexcept in the implementation too.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Bug #758798 (Émeric MASCHINO)
----
- gio/src/application.ccg | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/gio/src/application.ccg b/gio/src/application.ccg
-index 9fb5866..c7488ac 100644
---- a/gio/src/application.ccg
-+++ b/gio/src/application.ccg
-@@ -278,7 +278,7 @@ Application::Application(const Glib::ustring& application_id, ApplicationFlags f
- 
- }
- 
--Application::~Application()
-+Application::~Application() noexcept
- {
-   // Delete all OptionArgCallbackData instances that belong to this application.
-   std::lock_guard<std::mutex> lock(option_arg_callback_data_mutex);
--- 
-cgit v0.11.2
-
diff --git a/dev-cpp/glibmm/files/glibmm-2.46.2-use-noexcept2.patch b/dev-cpp/glibmm/files/glibmm-2.46.2-use-noexcept2.patch
deleted file mode 100644
index c6c38ff5a568..000000000000
--- a/dev-cpp/glibmm/files/glibmm-2.46.2-use-noexcept2.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Gio::Application: Destructor: Use noexcept in the implementation too.
-
-Bug #566426 (https://bugs.gentoo.org/show_bug.cgi?id=566426)
-
---- a/gio/giomm/application.cc	2015-09-22 11:13:25.000000000 +0200
-+++ b/gio/giomm/application.cc	2015-12-08 21:54:44.914338546 +0100
-@@ -284,7 +284,7 @@ Application::Application(const Glib::ust
- 
- }
- 
--Application::~Application()
-+Application::~Application() noexcept
- {
-   // Delete all OptionArgCallbackData instances that belong to this application.
-   Glib::Threads::Mutex::Lock lock(option_arg_callback_data_mutex);
diff --git a/dev-cpp/glibmm/glibmm-2.46.2.ebuild b/dev-cpp/glibmm/glibmm-2.46.2.ebuild
deleted file mode 100644
index 7cd6563876f3..000000000000
--- a/dev-cpp/glibmm/glibmm-2.46.2.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-
-inherit eutils gnome2 multilib-minimal
-
-DESCRIPTION="C++ interface for glib2"
-HOMEPAGE="http://www.gtkmm.org"
-
-LICENSE="LGPL-2.1+ GPL-2+" # GPL-2+ applies only to the build system
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="doc debug examples test"
-
-RDEPEND="
-	>=dev-libs/libsigc++-2.6.0:2[${MULTILIB_USEDEP}]
-	>=dev-libs/glib-2.46.0:2[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-"
-# dev-cpp/mm-common needed for eautoreconf
-
-src_prepare() {
-	# Gio::Application: Destructor: Use noexcept in the implementation too
-	# (from 'master')
-	epatch "${FILESDIR}"/${PN}-2.46.2-use-noexcept{,2}.patch
-
-	if ! use test; then
-		# don't waste time building tests
-		sed 's/^\(SUBDIRS =.*\)tests\(.*\)$/\1\2/' \
-			-i Makefile.am Makefile.in || die "sed 1 failed"
-	fi
-
-	# don't build examples - we want to install example sources, not binaries
-	sed 's/^\(SUBDIRS =.*\)examples\(.*\)$/\1\2/' \
-		-i Makefile.am Makefile.in || die "sed 2 failed"
-
-	# Test fails with IPv6 but not v4, upstream bug #720073
-#	sed -e 's:giomm_tls_client/test::' \
-#		-i tests/Makefile.{am,in} || die
-
-	gnome2_src_prepare
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" gnome2_src_configure \
-		$(use_enable debug debug-refcounting) \
-		$(multilib_native_use_enable doc documentation) \
-		--enable-deprecated-api
-}
-
-multilib_src_test() {
-	cd tests
-	default
-
-	for i in */test; do
-		${i} || die "Running tests failed at ${i}"
-	done
-}
-
-multilib_src_install() {
-	gnome2_src_install
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	if ! use doc && ! use examples; then
-		rm -fr "${ED}usr/share/doc/glibmm*"
-	fi
-
-	if use examples; then
-		find examples -type d -name '.deps' -exec rm -rf {} \; 2>/dev/null
-		dodoc -r examples
-	fi
-}
diff --git a/dev-cpp/glibmm/glibmm-2.46.1.ebuild b/dev-cpp/glibmm/glibmm-2.46.4.ebuild
similarity index 91%
rename from dev-cpp/glibmm/glibmm-2.46.1.ebuild
rename to dev-cpp/glibmm/glibmm-2.46.4.ebuild
index b85daf669d8c..0c95ad38ccae 100644
--- a/dev-cpp/glibmm/glibmm-2.46.1.ebuild
+++ b/dev-cpp/glibmm/glibmm-2.46.4.ebuild
@@ -5,7 +5,7 @@
 EAPI="5"
 GCONF_DEBUG="no"
 
-inherit gnome2 multilib-minimal
+inherit eutils gnome2 multilib-minimal
 
 DESCRIPTION="C++ interface for glib2"
 HOMEPAGE="http://www.gtkmm.org"
@@ -36,10 +36,6 @@ src_prepare() {
 	sed 's/^\(SUBDIRS =.*\)examples\(.*\)$/\1\2/' \
 		-i Makefile.am Makefile.in || die "sed 2 failed"
 
-	# Test fails with IPv6 but not v4, upstream bug #720073
-#	sed -e 's:giomm_tls_client/test::' \
-#		-i tests/Makefile.{am,in} || die
-
 	gnome2_src_prepare
 }
 
diff --git a/dev-cpp/gtkmm/Manifest b/dev-cpp/gtkmm/Manifest
index 14a24e6b1083..8703a8b14581 100644
--- a/dev-cpp/gtkmm/Manifest
+++ b/dev-cpp/gtkmm/Manifest
@@ -1,3 +1,4 @@
 DIST gtkmm-2.24.4.tar.xz 10262212 SHA256 443a2ff3fcb42a915609f1779000390c640a6d7fd19ad8816e6161053696f5ee SHA512 75d8c7a7c32adb33a9867b36877422bce52d8486d66be5aaa2afe1eee439efc2ba09aab7d06b9986d74879103415062c5386d5354aff6d44a63b2ba2d75f7c89 WHIRLPOOL 06074ec3f2f7adfe1f24b4d629ef73e852a9b21d719f2705f254389802813b53625be0be4aa30e191df134609b8349ea0725afcf858d26c0bf18282dd8358ab0
 DIST gtkmm-3.16.0.tar.xz 11468644 SHA256 9b8d4af5e1bb64e52b53bc8ef471ef43e1b9d11a829f16ef54c3a92985b0dd0c SHA512 282e53a0f3f3c4d1594057e4367bb4f4abe8fbf7f2bae2a819b35d4e4137a3e739aa83039114eb52eba16a9dd048abd78f011fb14635e53cf61019c6f4c06397 WHIRLPOOL 87c4dbccb79472c264621b3b96f5e06c73d03f4bbc0121f25e9c29f75e5c3e3e57aede9398b6c8b00e47d4eccd5eb6dfc6068c242af744f77f1d59af14bd2f25
 DIST gtkmm-3.18.0.tar.xz 11862504 SHA256 829fa113daed74398c49c3f2b7672807f58ba85d0fa463f5bc726e1b0138b86b SHA512 486a0c4bf6f5e6756c7eb0143374ef14d82ad41bca62403ece6ce76b4e56815a34751e331896126098c96983e767afbee35c9342bbb3908e551d5f31cadd496b WHIRLPOOL 5a268f65dbd067fd749e19e5cb9c2bf8ca718282b730ae3221297549d8a0dae4c6aa1eb7d744b0f9c4dd28a6ac5491e5a5f888975abc967ff792e87dd094ab6b
+DIST gtkmm-3.18.1.tar.xz 11872424 SHA256 747dff6164e5367db6fae6c30f01f0cb6bc14652353b1bdb33de8a69aa7b2520 SHA512 7f77b2e10c5041499541f5ee3762c2d17b243b6014b2d946afcd7c9d1112358db4803c08a411a4efe81a1013ae660c15ba67a7ebd0e17f3515d7258239b45cd9 WHIRLPOOL 0ccfef91c3fb0867ead5111d6c095df479fde4ea108465e4df226943a88b3db4443551eff350ffb8b823aa4b53646314b659b1491df16863326cc370327d8d76
diff --git a/dev-cpp/gtkmm/gtkmm-3.18.1.ebuild b/dev-cpp/gtkmm/gtkmm-3.18.1.ebuild
new file mode 100644
index 000000000000..d6ae8193fa9d
--- /dev/null
+++ b/dev-cpp/gtkmm/gtkmm-3.18.1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit eutils gnome2 multilib-minimal
+
+DESCRIPTION="C++ interface for GTK+"
+HOMEPAGE="http://www.gtkmm.org"
+
+LICENSE="LGPL-2.1+"
+SLOT="3.0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+
+IUSE="aqua doc examples test wayland X"
+REQUIRED_USE="|| ( aqua wayland X )"
+
+RDEPEND="
+	>=dev-cpp/glibmm-2.46.1:2[${MULTILIB_USEDEP}]
+	>=x11-libs/gtk+-3.18.0:3[aqua?,wayland?,X?,${MULTILIB_USEDEP}]
+	>=x11-libs/gdk-pixbuf-2.28:2[${MULTILIB_USEDEP}]
+	>=dev-cpp/atkmm-2.24.1[${MULTILIB_USEDEP}]
+	>=dev-cpp/cairomm-1.12.0[${MULTILIB_USEDEP}]
+	>=dev-cpp/pangomm-2.38.1:1.4[${MULTILIB_USEDEP}]
+	>=dev-libs/libsigc++-2.3.2:2[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	examples? ( >=media-libs/libepoxy-1.2[${MULTILIB_USEDEP}] )
+	doc? (
+		media-gfx/graphviz
+		dev-libs/libxslt
+		app-doc/doxygen )
+"
+#	dev-cpp/mm-common"
+# eautoreconf needs mm-common
+
+src_prepare() {
+	if ! use test; then
+		# don't waste time building tests
+		sed 's/^\(SUBDIRS =.*\)tests\(.*\)$/\1\2/' -i Makefile.am Makefile.in \
+			|| die "sed 1 failed"
+	fi
+
+	if ! use examples; then
+		# don't waste time building tests
+		sed 's/^\(SUBDIRS =.*\)demos\(.*\)$/\1\2/' -i Makefile.am Makefile.in \
+			|| die "sed 2 failed"
+	fi
+
+	gnome2_src_prepare
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" gnome2_src_configure \
+		--enable-api-atkmm \
+		$(multilib_native_use_enable doc documentation) \
+		$(use_enable aqua quartz-backend) \
+		$(use_enable wayland wayland-backend) \
+		$(use_enable X x11-backend)
+}
+
+multilib_src_install() {
+	gnome2_src_install
+}
+
+multilib_src_install_all() {
+	DOCS="AUTHORS ChangeLog PORTING NEWS README"
+	einstalldocs
+}
diff --git a/dev-db/mycli/Manifest b/dev-db/mycli/Manifest
index e4fbc958dd4e..7c5376b0d32a 100644
--- a/dev-db/mycli/Manifest
+++ b/dev-db/mycli/Manifest
@@ -1,2 +1,3 @@
 DIST mycli-1.4.0.tar.gz 250369 SHA256 300b26d21fc75fecdff04133dac7a22550f8f537b8571985ec02e8e346b00fb5 SHA512 06176a62646be4bac2b90f72bc728afc8920e9ff1b0c04749a5601ee63d35ba2159f48e61e23df6ca3bc5477486f3e3917b3a8de8b7034594f4ed2c544f2969f WHIRLPOOL 6ade59f9c8d7927710df0e2cd4e77cd450468b7558ce9ce763cc54e172a75fd2a84017fe3cc0e9d20a5dbd05585d80d135063b96a7692cd23c76a90806ff1aac
 DIST mycli-1.5.2.tar.gz 260595 SHA256 205f381f2c894863f6bce5d72856032e5e70fb9cc6bf02654943481457d7a63b SHA512 5015cadf10f0a2d31bffe6d2af620b7e4fdc9a40eb1760de49a5080524309330612ca3c75676925fb62c29a6f8ebdc599e725b4ba9b2ec9b741e84a8c9b9363b WHIRLPOOL b1ff602ec341f019c53eef9aca6d2167f95a9b6648f10075ec9f3cf5c5e1eaa590d17b42c561a606781c24a113975903836893e0a8e83f65fe479b7c232f34f4
+DIST mycli-1.6.0.tar.gz 265464 SHA256 e398b18d81a8d16f8e9d9fa46dec16bafade22e83ca5693effe26b36afe0f556 SHA512 783f42381778902f66756bf26ed04edce8a868d9ec43268b22b659bd7fb13dfdfffe6915d3ed9054f43b97cc198cefa362049fa643a29f0ba8bed4a94e1a80a5 WHIRLPOOL eb0f73df8a2a0372c8b24b7e4b89ba074ad3fae22aae283c7655734160463322301683c50efca26fdd911df321753a510f806c8697ef9a3a9ff12c3f193341d2
diff --git a/dev-db/mycli/mycli-1.6.0.ebuild b/dev-db/mycli/mycli-1.6.0.ebuild
new file mode 100644
index 000000000000..42622a938a66
--- /dev/null
+++ b/dev-db/mycli/mycli-1.6.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+inherit distutils-r1
+
+DESCRIPTION="CLI for MySQL Database with auto-completion and syntax highlighting"
+
+HOMEPAGE="http://mycli.net"
+SRC_URI="https://github.com/dbcli/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="BSD MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="
+	>=dev-python/click-4.1[${PYTHON_USEDEP}]
+	>=dev-python/configobj-5.0.6[${PYTHON_USEDEP}]
+	=dev-python/prompt_toolkit-0.60[${PYTHON_USEDEP}]
+	>=dev-python/pycrypto-2.6.1[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.0[${PYTHON_USEDEP}]
+	>=dev-python/pymysql-0.6.6[${PYTHON_USEDEP}]
+	>=dev-python/python-sqlparse-0.1.16[${PYTHON_USEDEP}]
+"
+
+src_prepare() {
+	rm mycli/packages/counter.py || die "Could not remove python 2.6 counter.py"
+	distutils-r1_src_prepare
+}
diff --git a/dev-db/rqlite/Manifest b/dev-db/rqlite/Manifest
index d3b1eaa1035b..7de255941906 100644
--- a/dev-db/rqlite/Manifest
+++ b/dev-db/rqlite/Manifest
@@ -1,16 +1,8 @@
 DIST bolt-2f846c3551b76d7710f159be840d66c3d064abbe.tar.gz 78184 SHA256 4358157d83f88a3e0fdd5b2faa810ce0e8569ce5594ce893634f0042b2dfcdab SHA512 429391842ac0ed04fb73587a1d21c2bf03a3c41f79fa192cc601ad4748a02ecd9a5ed024779a7267278f4c7a7152b1cf6d4e48ae1ceb31e52179506792ac4b51 WHIRLPOOL f0d5eabcd2936897124bc7bfc1c5e616c79d7deb0f465e9cbd2b28c6d45173e26c71303afc1a9f6e1ef513548d192d9e8c6e5addba4af4ef40edc564f82245f0
 DIST bolt-ee4a0888a9abe7eefe5a0992ca4cb06864839873.tar.gz 78144 SHA256 165a79b80801b667b9ae09becc6085ebc79a68de32403b31018010c89216d2bc SHA512 a1f1254a00c6ad05d9097e900f1918a1d05e0a945c2438e715f6d386fc0dad82b3302764afd7bfb2a43030e79c6a0271284c866caffdda216961c10e16b63e2a WHIRLPOOL 9917359c05160a4852e55d6e556b511ba374d6c16b2c78a7d9e3ad5566f7ef68dd08176993e9fac2dc7f69612dd7da12a96e0a73b5e1e19fa102b540f594b800
 DIST go-metrics-345426c77237ece5dab0e1605c3e4b35c3f54757.tar.gz 13610 SHA256 2efdf7c349cb81ef75fbb812e150aac9a7c6c27417f4e84f655ff77ddb006789 SHA512 2dd120d6da4d8cfcd4546a288534f233f7073281ed3d6e7712c8a92fc11f7b800c0950835037ec936ec89e6fc2dba06088d70bc7faee6f139cc9656c0a81d4b7 WHIRLPOOL ebe0a792cb231f3ff5241f8c2526c7a7927d6d1ab138e92ae0da34ba72e54bbb4769aa14804110e61d7de280ce28a0040ebd17e79ceccec585ad48c9aac91c33
-DIST go-metrics-51425a2415d21afadfd55cd93432c0bc69e9598d.tar.gz 33525 SHA256 42e9c8c59c90b84ae00dcaec111d6903a2c0e1f17ea89bdecf313ea3172e292d SHA512 1cc31cab2e0bfeb426c813b0e69fc9810be0c1024f01be81de3ea001da930dd6ff72793e4cb4895ceda7a43d0879b2c7ca6c640524d49c1080056382dc2b5e0b WHIRLPOOL 9a35efb70b827c7464a7fdb2866db93bf9e818b25a5a5038f6a0bf16ed06aaa16727c54bf08d6a18fe08cbbdca952e6878c41cdea3cea7287c87399cb22a43dd
 DIST go-msgpack-fa3f63826f7c23912c15263591e65d54d080b458.tar.gz 49488 SHA256 eeffbd458f4996334275f828cfd3549d32a2ba6eda359e5c9be09f091548781f SHA512 7e60a122cca007bf5455d6e15f77c24eaa5739deedc9e0c158282249e84698f873628bffa9eb7d23c1c59bda7632b1968ca770c8e1796e2d50750ac86e80fcb2 WHIRLPOOL 41745e39256ef510d42c4da413609e3bdd0621cc2acccfddabb4c8774e47b73ad46656639bed3fac2335cf1b6a2a245d3b8b4f3831cfafb2c6e7ecb90293475d
-DIST go-protobuf-0_pre20150809.tar.gz 151982 SHA256 160ad98eb1477492476ba566d218262fe6d326410d5a030c6a00433eaf7f9006 SHA512 04802b8d74ccaa17f9fc030badd0e74b6e47233ca5f1faab7c49f25bef2f06efd97aa4bf3f4783a7815958354744ddb9fee96d183aebbb03864069b0cc569564 WHIRLPOOL f49157a4a1a48c67b72ed38121ba28aec3f9b3405a3388097caba36643715c14b6915f9bcbd04f974fa98e9f2c4c4a4e313480ef307701c0ace734e9c214c010
-DIST go-raft-75a23dbefaeea0be2869de087c2cd3379e84c424.tar.gz 39529 SHA256 9525aa5fb9b2f8ccd90e7046c182dfb658340dd7d87d33c956685aa2abb17c38 SHA512 a66ef6c72c6c4b7c857e6da95f8600435dc5586148a7ec7adedcc08b454898d1577dab3dc2048e8a3367af5d3a25cb16b042e19643d1b707dfbaf324c5c631bc WHIRLPOOL 23adb88a0048b8406ed02baf5a2089059f7c1e2ca1d360f08507635ed76d3a155b31473bcb40716280483cfdf3d95992ba5f3df83da3f8eadeaf6892b932963c
-DIST go-sqlite3-1.1.0_p20160131.tar.gz 1847546 SHA256 d743a044d7ee88b2783f5a15f22b47ffdaa478c0b258babc3c621ce347955bb8 SHA512 9596012111b23865191904b7b0817ddbd88fc61383a3dfcf737d3d1be95c1a1d57b779ffbb9fa83303245a992c56e427396ffccb759a440822fffa516cae0b3d WHIRLPOOL a54021a0b8deb4fd28f44e45e8c78b896ef1121e4a23eb5fe6877b259c37456a6fb4fad77300a079fc3357a14b52d0b0750286a6f15431bdfefd17a99791c7c4
 DIST go-sqlite3-1.1.0_p20160307.tar.gz 1847839 SHA256 f3551d37bb2a485ef2c62c205bb104e6a19e25e3854e0106575db94891eba656 SHA512 e4613f8c18c4f5c60b09facfd6f6c36e14029538eef6deef94d57d0c0aeeed86023f36ed0fb0b7e5340ecbaad4f9b5815c5182cc19f85f52349610caaa998665 WHIRLPOOL 1eab66203e336c8081d18ba27f5aa706fc04d6c1d2b1e270457ca29d7785a3d77b36565f2b94003986a83a12618e3ffd376d8a38dee45af4c98219dce3fc69bf
-DIST gorilla-context-1c83b3eabd45b6d76072b66b746c20815fb2872d.tar.gz 4263 SHA256 f4cc863669fbf9251fd249b060d61f6678a1dd6a72fc31ca5a7e93a6314a0e0f SHA512 70be60b8981beada4a5992b43edb2205852e7f6ea50c2c9020af43593f666a67765f013b6ea0adc6ccbb4348a6857b82521a5040fea8a0f3c8a5a240729372ee WHIRLPOOL e80aca1f5eec967ed0434374841b2762e26c9537217f976d006c8ca0c0e55a6567eaa6e8500dbcd0f26a6b65dcf15bbd5d494b3530bdfafe5d30302fca0248af
-DIST gorilla-mux-26a6070f849969ba72b72256e9f14cf519751690.tar.gz 23501 SHA256 236a2e8e99d32a4a9e1c20a6f55d877a1d0e98916e69e115befcd102fba4e6a9 SHA512 29dd57afadb59bb9a6dbe66a47e6f414b6be650e205d21e367abda8b06342550dac322d61787e61855380545d7706ad15eff6b96cf718890aee03a2b5182a023 WHIRLPOOL ffeb4f358d97cef77130187ef22e51ca1a24280bcfe4dc4fe00f04c1d6ba61aa59b61f364e4ccd361f293715aa66fc922324a624ed6b7cc8845d518a504eb9d1
 DIST hashicorp-boltdb-d1e82c1ec3f15ee991f7cc7ffd5b67ff6f5bbaee.tar.gz 8881 SHA256 490ced07cc72baede9b997dcf92499fa0d4298926fbc51ee632bde3d3ea0979e SHA512 4f98cf8cf375561f255822cbd21b6926d3bd12ff2a1d9307b59ce5e12628034f197f6efc85d9cc9cf951eac7402b36954c2ea686bb033075ec840106614f2039 WHIRLPOOL 337d399c6b73893bb72d77a77e6b2c7b5ee914d191b719dec13f72975c0a4ece1ee6a902d32197bbf0f0300bdc3ce8efda082363a1e79a7d3f2d8aec6eb2d436
 DIST hashicorp-raft-057b893fd996696719e98b6c44649ea14968c811.tar.gz 60617 SHA256 0a97044468f5a7b0640296c0bf25c9b66c2f78a6df9fdd8bf8ea5d624549ea93 SHA512 cc98717d405e3ee2479d44d79a98228faba3ca3ff41064490dde7555ca35bc65d3a8765778298fd0372b6a8afd0b00e5a557b8ad736709a0534c3fc85f61f3d7 WHIRLPOOL 74fd868a541d356284482c4af37b8affd61bf9588ec8c8f631cdb65d5c019cb5e4c78472b2fe111b137bf3aaf414c49c994e03a08522342047cd140df20986c6
-DIST rqlite-1.0.tar.gz 18658 SHA256 ab282d373963bd50acf32fad89e250b40c2b3f015ddfb98ac45103054a1f7ec5 SHA512 a45f1c1dee1890ce557068b1080605fc32ddc909a45ee6edc6593ae6daa610b967b3fd5ab4e91cd6189d75ff824876bbd52006c5b3e392b48d35a612d708dd7a WHIRLPOOL 759e4f17a3552d2293c548d85136f872187bdb928f341bf84b51f902c56638690534d72b968a393676d3ce09bed9c371d67692c6b16e772f5a3624442682d5d1
-DIST rqlite-2.0_pre20160308.tar.gz 19443 SHA256 597afba704194e1b3a70431184057f41f57a541a59c92d5ebacf9a96762d70b6 SHA512 7361dc3b3a41d905845bbb250ae3ad7d83a50eea09044b5297fad031ecc165b35ba59e4f6ed06975d6a9936545e9c8e60e0e605d1ec09c2096f1a00d77033e74 WHIRLPOOL 8a19fa0694980df16021bac4fcee576d87e98d40c740c23506dbc16fa6ee1f24dcb925315639fd4fa7c7cc574391adc46e216a8270e13779f545808ff81c39a7
 DIST rqlite-2.1.tar.gz 22054 SHA256 0720cbf6972e83c7ca588440dee7f3c75d92baa5869244b3a36a8bb71b58af36 SHA512 fc34ef604a3b8c0d574d78e75baabdf9c1d859771a076a6cd1c11c0737d8bd412f23be44bbeb0ef6404700e22149c93f0d54e27046f9350b43e9c492b72ae457 WHIRLPOOL 2bc9f25ef533c0e55b317ad1cf2325643b772b6219e2af2e7a5510bdbae9d516f83a5547548336ba456dcb19c8ff440178a4547ff486602b99bab413bd3b839b
diff --git a/dev-db/rqlite/rqlite-1.0.ebuild b/dev-db/rqlite/rqlite-1.0.ebuild
deleted file mode 100644
index 053d71253fb1..000000000000
--- a/dev-db/rqlite/rqlite-1.0.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit golang-build
-
-KEYWORDS="~amd64"
-DESCRIPTION="Replicated SQLite using the Raft consensus protocol "
-EGO_PN="github.com/otoolep/rqlite/..."
-HOMEPAGE="https://${EGO_PN%/*} http://www.philipotoole.com/replicating-sqlite-using-raft-consensus"
-LICENSE="MIT"
-SLOT="0/${PVR}"
-IUSE=""
-RESTRICT="test"
-EGIT_COMMIT="v${PV}"
-SRC_URI="https://${EGO_PN%/*}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz
-	https://github.com/gorilla/mux/archive/26a6070f849969ba72b72256e9f14cf519751690.tar.gz -> gorilla-mux-26a6070f849969ba72b72256e9f14cf519751690.tar.gz
-	https://github.com/gorilla/context/archive/1c83b3eabd45b6d76072b66b746c20815fb2872d.tar.gz -> gorilla-context-1c83b3eabd45b6d76072b66b746c20815fb2872d.tar.gz
-	https://github.com/otoolep/raft/archive/75a23dbefaeea0be2869de087c2cd3379e84c424.tar.gz -> go-raft-75a23dbefaeea0be2869de087c2cd3379e84c424.tar.gz
-	https://github.com/golang/protobuf/archive/68c687dc49948540b356a6b47931c9be4fcd0245.tar.gz -> go-protobuf-0_pre20150809.tar.gz
-	https://github.com/rcrowley/go-metrics/archive/51425a2415d21afadfd55cd93432c0bc69e9598d.tar.gz -> go-metrics-51425a2415d21afadfd55cd93432c0bc69e9598d.tar.gz
-	https://github.com/mattn/go-sqlite3/archive/c5aee9649735e8dadac55eb968ccebd9fa29a881.tar.gz -> go-sqlite3-1.1.0_p20160131.tar.gz"
-
-get_archive_go_package() {
-	local archive=${1} uri x
-	for x in ${SRC_URI}; do
-		if [[ ${x} == http* ]]; then
-			uri=${x}
-		elif [[ ${x} == ${archive} ]]; then
-			break
-		fi
-	done
-	uri=${uri#https://}
-	echo ${uri%/archive/*}
-}
-
-unpack_go_packages() {
-	local go_package x
-	# Unpack packages to appropriate locations for GOPATH
-	for x in ${A}; do
-		unpack ${x}
-		if [[ ${x} == *.tar.gz ]]; then
-			go_package=$(get_archive_go_package ${x})
-			if [[ ${x%.tar.gz} -ef ${S} ]]; then
-				mv "${S}"{,_} || die
-				mkdir -p "${S}/src/${go_package%/*}" || die
-				mv "${S}"_ "${S}/src/${go_package}" || die || die
-			else
-				mkdir -p "${S}/src/${go_package%/*}" || die
-				mv "${go_package##*/}"-* "${S}/src/${go_package}" || die
-			fi
-		fi
-	done
-}
-
-src_unpack() {
-	unpack_go_packages
-}
-
-src_compile() {
-	# Omit $(get_golibdir_gopath) from GOPATH, in order to avoid
-	# interference from installed rqlite sources.
-	GOPATH="${WORKDIR}/${P}" \
-		go install -v -work -x ${EGO_BUILD_FLAGS} "${EGO_PN}" || die
-}
-
-src_install() {
-	golang_install_pkgs
-}
-
-golang_install_pkgs() {
-	dobin bin/${PN}
-	insinto $(dirname "${EPREFIX}$(get_golibdir)/src/${EGO_PN%/*}")
-	doins -r "${S}"/src/${EGO_PN%/*}
-	insinto $(dirname "${EPREFIX}$(get_golibdir)/pkg/$(go env GOOS)_$(go env GOARCH)/${EGO_PN%/*}")
-	doins -r "${S}"/pkg/$(go env GOOS)_$(go env GOARCH)/${EGO_PN%/*}
-	dodoc "${S}/src/${EGO_PN%/*}/README.md"
-}
diff --git a/dev-db/rqlite/rqlite-2.0_pre20160308.ebuild b/dev-db/rqlite/rqlite-2.0_pre20160308.ebuild
deleted file mode 100644
index f9cb81d1f7ec..000000000000
--- a/dev-db/rqlite/rqlite-2.0_pre20160308.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-fi
-
-inherit golang-build
-
-KEYWORDS="~amd64"
-DESCRIPTION="Replicated SQLite using the Raft consensus protocol "
-EGO_PN="github.com/otoolep/rqlite/..."
-HOMEPAGE="https://${EGO_PN%/*} http://www.philipotoole.com/replicating-sqlite-using-raft-consensus"
-LICENSE="MIT"
-SLOT="0/${PVR}"
-IUSE=""
-RESTRICT="test"
-EGIT_REPO_URI="https://github.com/otoolep/rqlite.git"
-EGIT_COMMIT="f65218201d46804e52459301b1e6c8a3af2c21ad"
-SRC_URI="https://${EGO_PN%/*}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz
-	https://github.com/armon/go-metrics/archive/345426c77237ece5dab0e1605c3e4b35c3f54757.tar.gz -> go-metrics-345426c77237ece5dab0e1605c3e4b35c3f54757.tar.gz
-	https://github.com/boltdb/bolt/archive/2f846c3551b76d7710f159be840d66c3d064abbe.tar.gz -> bolt-2f846c3551b76d7710f159be840d66c3d064abbe.tar.gz
-	https://github.com/hashicorp/go-msgpack/archive/fa3f63826f7c23912c15263591e65d54d080b458.tar.gz -> go-msgpack-fa3f63826f7c23912c15263591e65d54d080b458.tar.gz
-	https://github.com/hashicorp/raft/archive/057b893fd996696719e98b6c44649ea14968c811.tar.gz -> hashicorp-raft-057b893fd996696719e98b6c44649ea14968c811.tar.gz
-	https://github.com/hashicorp/raft-boltdb/archive/d1e82c1ec3f15ee991f7cc7ffd5b67ff6f5bbaee.tar.gz -> hashicorp-boltdb-d1e82c1ec3f15ee991f7cc7ffd5b67ff6f5bbaee.tar.gz
-	https://github.com/mattn/go-sqlite3/archive/10876d7dac65f02064c03d7372a2f1dfb90043fe.tar.gz -> go-sqlite3-1.1.0_p20160307.tar.gz"
-
-get_archive_go_package() {
-	local archive=${1} uri x
-	for x in ${SRC_URI}; do
-		if [[ ${x} == http* ]]; then
-			uri=${x}
-		elif [[ ${x} == ${archive} ]]; then
-			break
-		fi
-	done
-	uri=${uri#https://}
-	echo ${uri%/archive/*}
-}
-
-unpack_go_packages() {
-	local go_package x
-	# Unpack packages to appropriate locations for GOPATH
-	for x in ${A}; do
-		unpack ${x}
-		if [[ ${x} == *.tar.gz ]]; then
-			go_package=$(get_archive_go_package ${x})
-			if [[ ${x%.tar.gz} -ef ${S} ]]; then
-				mv "${S}"{,_} || die
-				mkdir -p "${S}/src/${go_package%/*}" || die
-				mv "${S}"_ "${S}/src/${go_package}" || die || die
-			else
-				mkdir -p "${S}/src/${go_package%/*}" || die
-				for x in "${go_package##*/}"-*; do
-					if [[ ! ${x} -ef ${S} ]]; then
-						mv "${x}" "${S}/src/${go_package}" || die
-					fi
-				done
-			fi
-		fi
-	done
-}
-
-src_unpack() {
-	if [[ ${PV} == *9999* ]]; then
-		git-r3_src_unpack
-		mv "${S}"{,_} || die
-		mkdir -p "$(dirname "${S}/src/${EGO_PN%/*}")" || die
-		mv "${S}_" "${S}/src/${EGO_PN%/*}" || die
-	fi
-	unpack_go_packages
-}
-
-src_compile() {
-	# Omit $(get_golibdir_gopath) from GOPATH, in order to avoid
-	# interference from installed rqlite sources.
-	GOPATH="${WORKDIR}/${P}" \
-		go install -v -work -x ${EGO_BUILD_FLAGS} "${EGO_PN}" || die
-}
-
-src_install() {
-	golang_install_pkgs
-}
-
-golang_install_pkgs() {
-	dobin bin/${PN}d
-	insinto $(dirname "${EPREFIX}$(get_golibdir)/src/${EGO_PN%/*}")
-	rm -rf "${S}"/src/${EGO_PN%/*}/.git*
-	doins -r "${S}"/src/${EGO_PN%/*}
-	insinto $(dirname "${EPREFIX}$(get_golibdir)/pkg/$(go env GOOS)_$(go env GOARCH)/${EGO_PN%/*}")
-	doins -r "${S}"/pkg/$(go env GOOS)_$(go env GOARCH)/${EGO_PN%/*}{,.a}
-	dodoc "${S}/src/${EGO_PN%/*}/README.md"
-}
diff --git a/dev-games/crystalspace/crystalspace-2.0-r1.ebuild b/dev-games/crystalspace/crystalspace-2.0-r1.ebuild
index e90bc2ee8f93..20aaa6f22755 100644
--- a/dev-games/crystalspace/crystalspace-2.0-r1.ebuild
+++ b/dev-games/crystalspace/crystalspace-2.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -46,7 +46,7 @@ DEPEND="${COMMON_DEP}
 	java? ( >=virtual/jdk-1.5
 		dev-java/ant-core )
 	dev-util/ftjam
-	dev-lang/swig
+	<dev-lang/swig-3
 	virtual/pkgconfig"
 
 S=${WORKDIR}/${MY_P}
@@ -60,6 +60,7 @@ src_prepare() {
 		docs/Jamfile || die
 	epatch \
 		"${FILESDIR}"/${P}-gcc47.patch \
+		"${FILESDIR}"/${P}-gcc52.patch \
 		"${FILESDIR}"/${P}-wxgtk.patch
 	use wxwidgets && append-libs -lGL
 	AT_M4DIR=mk/autoconf \
diff --git a/dev-games/crystalspace/files/crystalspace-2.0-gcc52.patch b/dev-games/crystalspace/files/crystalspace-2.0-gcc52.patch
new file mode 100644
index 000000000000..341b33d88850
--- /dev/null
+++ b/dev-games/crystalspace/files/crystalspace-2.0-gcc52.patch
@@ -0,0 +1,53 @@
+--- include/csgfx/imagememory.h.old	2016-04-17 09:09:31.497152401 +0200
++++ include/csgfx/imagememory.h	2016-04-17 09:12:13.838355158 +0200
+@@ -179,8 +179,8 @@
+   /// Get a pointer to the alpha data that can be changed.
+   uint8* GetAlphaPtr ();
+ 
+-  virtual const void* GetImageData () { return GetImagePtr (); }
+-  virtual int GetWidth () const { return Width; }
++  virtual const void* GetImageData ();
++  virtual int GetWidth () const;
+   virtual int GetHeight () const { return Height; }
+   virtual int GetDepth () const { return Depth; }
+ 
+--- libs/csgfx/imagememory.cpp.old	2016-04-17 09:07:19.555451540 +0200
++++ libs/csgfx/imagememory.cpp	2016-04-17 09:13:09.339398463 +0200
+@@ -208,6 +208,23 @@
+   EnsureImage();
+   return (void*)databuf->GetData ();
+ }
++
++const void* csImageMemory::GetImageData ()
++{
++  return GetImagePtr ();
++}
++
++int csImageMemory::GetWidth () const
++{
++  return Width;
++}
++
++void csImageBase::SetName (const char* iName)
++{
++  cs_free (fName);
++  fName = CS::StrDup (iName);
++}
++
+ csRGBpixel* csImageMemory::GetPalettePtr ()
+ {
+   EnsureImage();
+--- include/csgfx/imagebase.h.old	2016-04-17 09:59:09.211101864 +0200
++++ include/csgfx/imagebase.h	2016-04-17 09:59:20.041919599 +0200
+@@ -61,10 +61,7 @@
+   // Most images are 2D, so provide a sensible default
+   virtual int GetDepth () const { return 1; }
+ 
+-  virtual void SetName (const char* iName)
+-  {
+-    cs_free (fName); fName = CS::StrDup (iName);
+-  }
++  virtual void SetName (const char* iName);
+   virtual const char* GetName () const { return fName; }
+ 
+   /* Commented out: should be implemented by all descendants.
diff --git a/dev-java/jupidator/Manifest b/dev-java/jupidator/Manifest
index cffaea20f235..a393dc742815 100644
--- a/dev-java/jupidator/Manifest
+++ b/dev-java/jupidator/Manifest
@@ -1 +1,2 @@
+DIST jupidator-0.6.0.tar.bz2 253170 SHA256 00213313f794363cc3b4dd8c335cb35cc8582d0d56d72cb941b3edc8f2b94580 SHA512 5e96831ca41b6871eb5f6c883c21eae17474844a74fc5e103b534d6e225d0a16ef98149da1d52728e737607eb7ece586f05aafa0a0ada29c4c28ff3e078a2415 WHIRLPOOL f8625ac738c610c1b3ed60f05a140b0e7367d97189bc27e70666886879c1da74117df360b938718861a4f8a52fdea7e8ed8355b68b33fb459272145481a3f45a
 DIST jupidator.0.6.0.tar.bz2 253170 SHA256 00213313f794363cc3b4dd8c335cb35cc8582d0d56d72cb941b3edc8f2b94580 SHA512 5e96831ca41b6871eb5f6c883c21eae17474844a74fc5e103b534d6e225d0a16ef98149da1d52728e737607eb7ece586f05aafa0a0ada29c4c28ff3e078a2415 WHIRLPOOL f8625ac738c610c1b3ed60f05a140b0e7367d97189bc27e70666886879c1da74117df360b938718861a4f8a52fdea7e8ed8355b68b33fb459272145481a3f45a
diff --git a/dev-java/jupidator/jupidator-0.6.0-r1.ebuild b/dev-java/jupidator/jupidator-0.6.0-r1.ebuild
new file mode 100644
index 000000000000..650ed9bc9303
--- /dev/null
+++ b/dev-java/jupidator/jupidator-0.6.0-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_P="${PN}.${PV}"
+
+DESCRIPTION="Jupidator is a library/tool in Java for automatic updating of applications"
+HOMEPAGE="http://www.sourceforge.net/projects/jupidator"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2 -> ${P}.tar.bz2"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=virtual/jre-1.6"
+
+DEPEND="
+	>=virtual/jdk-1.6
+	source? ( app-arch/zip )"
+
+S="${WORKDIR}/${PN}"
+
+JAVA_SRC_DIR="src"
+
+java_prepare() {
+	java-pkg_clean
+}
diff --git a/dev-perl/PerlIO-via-Timeout/Manifest b/dev-perl/PerlIO-via-Timeout/Manifest
index d52e3eb0cb66..976db6205353 100644
--- a/dev-perl/PerlIO-via-Timeout/Manifest
+++ b/dev-perl/PerlIO-via-Timeout/Manifest
@@ -1,2 +1 @@
-DIST PerlIO-via-Timeout-0.29.tar.gz 13404 SHA256 0f9dc6f540671039c74254f5e081cf55c569820448c9929861e66ab66f93f5ca SHA512 824e99209e8c0ff93b3cff97139f27170a3034c98866a34b9dd80d6a938cfaa8db39ab5dacc20bd87aa94b0411f100b8744ac3f00672049d23d2324430b77f7c WHIRLPOOL ae69a8520862ebb41e2eb8fde96db69ecd8a8386d3a0ab31d6df88cbc4ef189edc7c2d73ae9cce28c6be4a67a1981698a379cde327eeb40824006991a773b9da
 DIST PerlIO-via-Timeout-0.32.tar.gz 13560 SHA256 9278f9ef668850d913d98fa4c0d7e7d667cff3503391f4a4eae73a246f2e7916 SHA512 52200c0d19da7a19b9b328473b0e7b57a1a3102fd3ace947af8fef8f670aaebe37811daaa2e2b6cf2f6397855a4cfb2424af053322146a8acefd71e1bb30f681 WHIRLPOOL 89f5e21150f4631f621ea40f54501ae4516b6efa5739c77cfa3c75a7aae7caf967d3db40ee0e97e91abd8c946eb7920fc41ed64a5410efa2e7de2534eba41cf0
diff --git a/dev-perl/PerlIO-via-Timeout/PerlIO-via-Timeout-0.290.0.ebuild b/dev-perl/PerlIO-via-Timeout/PerlIO-via-Timeout-0.290.0.ebuild
deleted file mode 100644
index 8da575a855e7..000000000000
--- a/dev-perl/PerlIO-via-Timeout/PerlIO-via-Timeout-0.290.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=DAMS
-MODULE_VERSION=0.29
-inherit perl-module
-
-DESCRIPTION="PerlIO layer that adds read & write timeout to a handle"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="
-	>=virtual/perl-Exporter-5.570.0
-	virtual/perl-Scalar-List-Utils
-	dev-perl/Time-Out
-"
-DEPEND="
-	>=dev-perl/Module-Build-Tiny-0.30.0
-	>=virtual/perl-ExtUtils-MakeMaker-6.300.0
-	virtual/perl-File-Spec
-	virtual/perl-IO
-	test? (
-		virtual/perl-Test-Simple
-		dev-perl/Test-TCP
-	)
-"
-
-mytargets="install"
diff --git a/dev-perl/Plack/Manifest b/dev-perl/Plack/Manifest
index 0fb24edc0ed0..12dc7c25bf7a 100644
--- a/dev-perl/Plack/Manifest
+++ b/dev-perl/Plack/Manifest
@@ -1,3 +1 @@
-DIST Plack-1.0032.tar.gz 238047 SHA256 3a7a5fcc5f77d350a5dbf8f448d25178634d175d3d4bf77b4953ae32f97a90ad SHA512 877d2471106d941b192f19a569ea2a8dd990526242941d55104788629f551af52ed75e762788023f22962cd2d185c3fc8756e4a3253a9fc4e3a8152eab49b3f3 WHIRLPOOL ed6c1714082201dcacacd12021aa430c49e03b95a49dfcaea6205c7011ac5e41ecc449e1eeda60182604c19e303fa771d9c686cee2222b39fc819a5acbd9ff1c
-DIST Plack-1.0037.tar.gz 175676 SHA256 70be5f33d011b9ffa2b3a6fc7ce0aa15df53f8974e46b2e8e5af5131b1d41c62 SHA512 9bfda2b28f806184aaf36aff62497ee34f352b4a98ebeb3d4f907613575d8cc7005e446a7a14374dc84e0e11b668e23f7b529505749885face868e84a54677f2 WHIRLPOOL 89e7443946e4c95d37516d0dc888a9a26e5182e74281d42500439bba43e1c23d7b983be2131e5f2abd1e7aac2caf707b45d713e618ab436fa7748cb99313fa1c
 DIST Plack-1.0039.tar.gz 176711 SHA256 d24a572e88644c7d39c7e6ff1af005b728dec94a878cf06d9027ab7d1a2fd0a9 SHA512 963e30ec721a96f99ac9524b1b38861965aa84878062551ae77e62c7b2724cf00d6e7e265dde1c88f3e1aa3da7ca41bb5a392e990409380de09c1c1b769b5387 WHIRLPOOL 6ff44dd92d321c3a331cebd879fafad4945af420ef59594195127b723743db57c6f6407f234fe15dc567c5a7c5f576a91939567af318d16b0866ef8b7f34a265
diff --git a/dev-perl/Plack/Plack-1.3.200.ebuild b/dev-perl/Plack/Plack-1.3.200.ebuild
deleted file mode 100644
index 9779b80df3f0..000000000000
--- a/dev-perl/Plack/Plack-1.3.200.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=MIYAGAWA
-MODULE_VERSION=1.0032
-inherit perl-module
-
-DESCRIPTION="Perl Superglue for Web frameworks and Web Servers (PSGI toolkit)"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="
-	>=dev-perl/Apache-LogFormat-Compiler-0.120.0
-	>=dev-perl/Devel-StackTrace-1.230.0
-	>=dev-perl/Devel-StackTrace-AsHTML-0.110.0
-	>=dev-perl/File-ShareDir-1.0.0
-	dev-perl/Filesys-Notify-Simple
-	>=dev-perl/HTTP-Body-1.60.0
-	>=dev-perl/HTTP-Message-5.814.0
-	>=virtual/perl-HTTP-Tiny-0.34.0
-	>=dev-perl/Hash-MultiValue-0.50.0
-	>=virtual/perl-Pod-Parser-1.360.0
-	>=dev-perl/Stream-Buffered-0.20.0
-	>=dev-perl/Test-TCP-2.0.0
-	dev-perl/Try-Tiny
-	>=dev-perl/URI-1.590.0
-	virtual/perl-parent
-"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	>=dev-perl/File-ShareDir-Install-0.60.0
-	test? (
-		>=virtual/perl-Test-Simple-0.880.0
-		dev-perl/Test-Requires
-	)
-"
-
-SRC_TEST="do parallel"
diff --git a/dev-perl/Plack/Plack-1.3.700.ebuild b/dev-perl/Plack/Plack-1.3.700.ebuild
deleted file mode 100644
index 5ae6e3a181e6..000000000000
--- a/dev-perl/Plack/Plack-1.3.700.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=MIYAGAWA
-MODULE_VERSION=1.0037
-inherit perl-module
-
-DESCRIPTION="Perl Superglue for Web frameworks and Web Servers (PSGI toolkit)"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="
-	>=dev-perl/Apache-LogFormat-Compiler-0.120.0
-	>=dev-perl/Cookie-Baker-0.50.0
-	>=dev-perl/Devel-StackTrace-1.230.0
-	>=dev-perl/Devel-StackTrace-AsHTML-0.110.0
-	>=dev-perl/File-ShareDir-1.0.0
-	dev-perl/Filesys-Notify-Simple
-	>=dev-perl/HTTP-Body-1.60.0
-	>=dev-perl/HTTP-Headers-Fast-0.180.0
-	>=dev-perl/HTTP-Message-5.814.0
-	>=virtual/perl-HTTP-Tiny-0.34.0
-	>=dev-perl/Hash-MultiValue-0.50.0
-	>=virtual/perl-Pod-Parser-1.360.0
-	>=dev-perl/Stream-Buffered-0.20.0
-	>=dev-perl/Test-TCP-2.0.0
-	dev-perl/Try-Tiny
-	>=dev-perl/URI-1.590.0
-	virtual/perl-parent
-"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	>=dev-perl/File-ShareDir-Install-0.60.0
-	test? (
-		>=virtual/perl-Test-Simple-0.880.0
-		dev-perl/Test-Requires
-	)
-"
-
-# SRC_TEST="do parallel"
-# one test fails due to Perl 5.22 regex deprecation warnings :(
diff --git a/dev-python/flask-sqlalchemy/Manifest b/dev-python/flask-sqlalchemy/Manifest
index 58cf9b5de22b..2b6c7f898682 100644
--- a/dev-python/flask-sqlalchemy/Manifest
+++ b/dev-python/flask-sqlalchemy/Manifest
@@ -1,4 +1,3 @@
-DIST Flask-SQLAlchemy-0.16.tar.gz 97968 SHA256 eaffc4252657229bb8da7447726e9e74b83087b96a3b8990121361b322985b6f SHA512 a6a8f5043aba14fb7fc2c59631d76ec0277d1a01f8b6bd4890271a59f9480ed40665747630194a43a5c19f694e932f86e56b1dfe4a3060176941c82c310ea5fa WHIRLPOOL c3f5fc30c956d39518229289cf7017b589392e18b448d2ec9d5650ed21d5d26309e1f2a60e4bc0e4e5f5cc8fc943f51f0cdc9e8f99d801ab6bfcb6c9600499c6
 DIST Flask-SQLAlchemy-1.0.tar.gz 92063 SHA256 7f0e218fa9066b34b73fdc470386a37ee117b8a862db98c1bca8236d8cffe7a1 SHA512 0ab84f4f5a0709c25d6177431787898f13543bd5a97fc67da9a376be66bfb27d1d7437d28a73e5052b5d20cab237b22a16add91159efaabdd133ca2f546fa5b4 WHIRLPOOL b0b394354975943d216d9fd690012cfd32c3b263ade0d85d92ebee856905fddbb523b3db5e6ec74574ddff0de57ec3162884db6e1563f9a5b71b1223279a7b0e
 DIST Flask-SQLAlchemy-2.0.tar.gz 93413 SHA256 990387d2cff83df7feb40e9d6b286f2679144258480249cbd47b88dc0939e886 SHA512 7a1962764a5481d0f7ce0ec0beb260dfbd930e76cc426e3f645cdd436f920ebb01ef8bb369c29d2e0bf4a4db29f4a660de8f44ea9110c95e440c0506922c8690 WHIRLPOOL f2c4966262d27f56e48a0a35f9b38595c95327eb7fa5cf6296d4d913ec2d933fc6092d6e08a705643e62210b5b03bda2857c6b9a939f9212f142bcb8b0c40243
 DIST Flask-SQLAlchemy-2.1.tar.gz 95967 SHA256 c5244de44cc85d2267115624d83faef3f9e8f088756788694f305a5d5ad137c5 SHA512 023f3dd011a57768e921928dd3df791a54c64bb8a0cc1bb545dbb8e16dda263b730da74a0d400e5a057819830dd4cd014a642098a081c956a7ea8a2d37ec112a WHIRLPOOL 8acda8985dadde8f14157e9462c3d34220e0bed8b571797aa11f3f415dfee287bfb412142a94dfe725c1d6aab17e241bead90cd1b5128d29ee9905422e58b769
diff --git a/dev-python/flask-sqlalchemy/files/mapping.patch b/dev-python/flask-sqlalchemy/files/mapping.patch
index 32bee9c4f148..af6572489a4f 100644
--- a/dev-python/flask-sqlalchemy/files/mapping.patch
+++ b/dev-python/flask-sqlalchemy/files/mapping.patch
@@ -1,6 +1,6 @@
 diff -ur Flask-SQLAlchemy-1.0.orig/docs/conf.py Flask-SQLAlchemy-1.0/docs/conf.py
---- docs/conf.py	2013-01-27 08:57:36.000000000 +0800
-+++ docs/conf.py	2014-04-03 18:08:34.772268079 +0800
+--- a/docs/conf.py	2013-01-27 08:57:36.000000000 +0800
++++ b/docs/conf.py	2014-04-03 18:08:34.772268079 +0800
 @@ -224,9 +224,9 @@
  
  
diff --git a/dev-python/flask-sqlalchemy/flask-sqlalchemy-0.16-r1.ebuild b/dev-python/flask-sqlalchemy/flask-sqlalchemy-0.16-r1.ebuild
deleted file mode 100644
index 70b54afc3b50..000000000000
--- a/dev-python/flask-sqlalchemy/flask-sqlalchemy-0.16-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-MY_PN="Flask-SQLAlchemy"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="SQLAlchemy support for Flask applications"
-HOMEPAGE="https://pypi.python.org/pypi/Flask-SQLAlchemy"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-python/flask[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/sqlalchemy[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-python_prepare_all() {
-	sed -ie "s/flaskext/flask.ext/" test.py || die
-}
-
-python_test() {
-	#https://github.com/mitsuhiko/flask-sqlalchemy/issues/128
-	nosetests || die "Tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/flask-sqlalchemy/flask-sqlalchemy-2.1.ebuild b/dev-python/flask-sqlalchemy/flask-sqlalchemy-2.1.ebuild
index 0b58296ca5e7..7a4cff5c2c77 100644
--- a/dev-python/flask-sqlalchemy/flask-sqlalchemy-2.1.ebuild
+++ b/dev-python/flask-sqlalchemy/flask-sqlalchemy-2.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} pypy )
 
 inherit distutils-r1
 
diff --git a/dev-python/flask-sqlalchemy/metadata.xml b/dev-python/flask-sqlalchemy/metadata.xml
index 74a0a807e782..53187fdda862 100644
--- a/dev-python/flask-sqlalchemy/metadata.xml
+++ b/dev-python/flask-sqlalchemy/metadata.xml
@@ -10,5 +10,11 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="pypi">Flask-SQLAlchemy</remote-id>
+		<remote-id type="github">mitsuhiko/flask-sqlalchemy</remote-id>
+		<bugs-to>https://github.com/mitsuhiko/flask-sqlalchemy/issues</bugs-to>
 	</upstream>
+	<longdescription lang="en">
+		Flask-SQLAlchemy is a Flask microframework extension which adds
+		support for the SQLAlchemy SQL toolkit/ORM.
+	</longdescription>
 </pkgmetadata>
diff --git a/dev-python/pymediainfo/Manifest b/dev-python/pymediainfo/Manifest
index 6d04258b253b..23ab9f164f88 100644
--- a/dev-python/pymediainfo/Manifest
+++ b/dev-python/pymediainfo/Manifest
@@ -1,2 +1,2 @@
 DIST pymediainfo-1.4.0.tar.gz 2301 SHA256 d865a79a75d5690af69d31621364ec64b7612a161dfa9b1a84d833a95c1ef19a SHA512 e1e68766340e3a452d672a3ca26d576cc47abad8fc88a4abf28a5be177ce80b8d90d177b44659f01794fbb0c50b2d6c581dbcb07363a09cb872698ec1067988c WHIRLPOOL 9d9a0c6b523253c4e161e6d7388e1e63fbc301d2bd90774fe07b1dbf9eb611acb63228337b0bd2297b99d620473aab8fd086f77354ca25c26395a2f8df37a25d
-DIST pymediainfo-2.0.tar.gz 417082 SHA256 083ffd1977becd1aa6c77d333473448d287f9ebe2f95ff8fd5fdd6631c6b9bbf SHA512 0de3100cf28a752a3677c6340fcd2097b2d5e1102ffee03693184475fb1bd631568b4cf1b0c4c09461c46afb8b137ecb8d4244bf7e3fae0882d60c038d7efb45 WHIRLPOOL c1e97458282f70b6295decde27fa219f080fea5276a0f5b4afd01ec5bfe0876073cbf9f63c95d63d529c21a2e4db967bd19e6d44f81c38f20c2c0749f5dfe20c
+DIST pymediainfo-2.1.tar.gz 420280 SHA256 60598b8bb81c6ef2aa13d7b9bbc0c389d4294d89a7a1516eae27834c2fbf9dea SHA512 844353e7f526902aebaa4a4806d42e173e3d7bb0c7d42588ad5438ec7fef03f67bb2151bccf09af61478c386f5ce791cf24a2f99f8d7d6ceb22a08ab236ee70a WHIRLPOOL 8dcbfd0b6537256e511c5fbba8defc0382fcb35ee39c9fdf1b68b2b5b50a248930e71a2a2844ae280f38b70190f45c20b26e1222c37418794f55d881f7a6e9fa
diff --git a/dev-python/pymediainfo/metadata.xml b/dev-python/pymediainfo/metadata.xml
index 56360ccca444..b60ae270951a 100644
--- a/dev-python/pymediainfo/metadata.xml
+++ b/dev-python/pymediainfo/metadata.xml
@@ -12,5 +12,6 @@
   <upstream>
 	  <remote-id type="pypi">pymediainfo</remote-id>
 	  <remote-id type="github">sbraz/pymediainfo</remote-id>
+	  <bugs-to>https://github.com/sbraz/pymediainfo/issues</bugs-to>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/pymediainfo/pymediainfo-2.0.ebuild b/dev-python/pymediainfo/pymediainfo-2.1.ebuild
similarity index 81%
rename from dev-python/pymediainfo/pymediainfo-2.0.ebuild
rename to dev-python/pymediainfo/pymediainfo-2.1.ebuild
index f687fbdc1f6e..77853704fc19 100644
--- a/dev-python/pymediainfo/pymediainfo-2.0.ebuild
+++ b/dev-python/pymediainfo/pymediainfo-2.1.ebuild
@@ -2,22 +2,22 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
 
 inherit distutils-r1
 
-DESCRIPTION="A wrapper around the mediainfo command"
+DESCRIPTION="A wrapper around the mediainfo library"
 HOMEPAGE="https://github.com/sbraz/pymediainfo"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="test"
 
-RDEPEND="media-video/mediainfo"
+RDEPEND="media-libs/libmediainfo"
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
diff --git a/dev-python/sip/Manifest b/dev-python/sip/Manifest
index fc9dd24c5a4d..988913f6b0d5 100644
--- a/dev-python/sip/Manifest
+++ b/dev-python/sip/Manifest
@@ -1,3 +1,4 @@
 DIST sip-4.16.2.tar.gz 793663 SHA256 a55a2324a46ab42e42ae57c52ef06583b17d25c987973fe2e7ff2e8a649294ce SHA512 07ced0188bd4dc897ddacbce226b33ac9d236455a95018e900fd5f652439c905ddd56688f8bb29f704fcf201a8e668d5cc89ba887065826653087cf0a9f6dbfb WHIRLPOOL 47c741f1b787ba147e7a299e3c93a7537f14f1b192726e39f3679d0b0e0a991df603509c5674f262311259d9ad2e1e845746d215d5ef70eb7b827c1557eb8b82
 DIST sip-4.16.9.tar.gz 957858 SHA256 dbe173aa566e26ca0bb5bcbc1d30ef780f416267bb3b5df48149a737ea6b0555 SHA512 f9e7deac3462f71e809fce29aea4b7e7e3d1acb7600252178459cfb9e09d1543e9a189bdc66c946c9d11c4a6f3175a6d6b306481cadab70ed7f17f6e7c328ddc WHIRLPOOL f4cfcb5ecc945332683bdcbd6913b87fc975f8e268e02e6bdeaadebf578e40f1e94a3c76cdb1ea3890ec969d1454560d58df01ba4ad507d914a300076365ade0
 DIST sip-4.17.tar.gz 959835 SHA256 603026822adf8673fca6e0ea20b02c3c4a2dccb309647656f7269adc8de89060 SHA512 ac9af0b0e8424152a9768bccacd4db393fd3f4e5c8cf171863d9e615564c744c5be4d0b4af82c5ceed8d27f9845e308f559df30153e6d5bce8d4e2af6e5192d9 WHIRLPOOL a11d1f3d43b60fa06bc67dec60a500c0c163f179bec8865e5eef286c191652fd51d45965f8f96c3c13365976a5bd85c36454924a4da9c1508df0d807466ecf20
+DIST sip-4.18.tar.gz 991980 SHA256 f1dc5c81c07a9ad97edcd4a0af964a41e420024ba7ca165afd2b351efd249cb6 SHA512 365fb51b8c833ebc923b87a961fac83976b653ebcec8fe7ad1543ee5a406471eb9309c8efbee6662c7b622f36771cd3ac31ede10208f23d2531a45af906d383d WHIRLPOOL 3cf3516483e62ed26fca1de6bc90e58a2bd04d3d66214b0f62eb4338c2b7a8a595d46952ef86cd7fa61e50b160a06b484a7d4f5997be2f2a7714b1edabaef2a4
diff --git a/dev-python/sip/files/sip-4.18-darwin.patch b/dev-python/sip/files/sip-4.18-darwin.patch
new file mode 100644
index 000000000000..6dd45ac024e3
--- /dev/null
+++ b/dev-python/sip/files/sip-4.18-darwin.patch
@@ -0,0 +1,30 @@
+diff -ru sip-4.18.orig/siputils.py sip-4.18/siputils.py
+--- sip-4.18.orig/siputils.py	2016-04-16 22:38:22.662502890 +0200
++++ sip-4.18/siputils.py	2016-04-16 22:38:39.881551111 +0200
+@@ -946,8 +946,6 @@
+         """
+         if self.generator in ("MSVC", "MSVC.NET", "MSBUILD", "BMAKE"):
+             plib = clib + ".lib"
+-        elif sys.platform == "darwin" and framework:
+-            plib = "-framework " + clib
+         else:
+             plib = "-l" + clib
+ 
+@@ -962,8 +960,6 @@
+         """
+         if self.generator in ("MSVC", "MSVC.NET", "MSBUILD", "BMAKE"):
+             prl_name = os.path.join(self.config.qt_lib_dir, clib + ".prl")
+-        elif sys.platform == "darwin" and framework:
+-            prl_name = os.path.join(self.config.qt_lib_dir, clib + ".framework", clib + ".prl")
+         else:
+             prl_name = os.path.join(self.config.qt_lib_dir, "lib" + clib + ".prl")
+ 
+@@ -1639,7 +1635,7 @@
+             if sys.platform == "win32":
+                 ext = "pyd"
+             elif sys.platform == "darwin":
+-                ext = "so"
++                ext = "bundle"
+             elif sys.platform == "cygwin":
+                 ext = "dll"
+             else:
diff --git a/dev-python/sip/sip-4.18.ebuild b/dev-python/sip/sip-4.18.ebuild
new file mode 100644
index 000000000000..799bd72a42cc
--- /dev/null
+++ b/dev-python/sip/sip-4.18.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
+
+inherit python-r1 toolchain-funcs
+
+DESCRIPTION="Python extension module generator for C and C++ libraries"
+HOMEPAGE="http://www.riverbankcomputing.com/software/sip/intro https://pypi.python.org/pypi/SIP"
+SRC_URI="mirror://sourceforge/pyqt/${P}.tar.gz"
+
+# Sub-slot based on SIP_API_MAJOR_NR from siplib/sip.h.in
+SLOT="0/11"
+LICENSE="|| ( GPL-2 GPL-3 SIP )"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="debug doc"
+
+RDEPEND="${PYTHON_DEPS}"
+DEPEND="${RDEPEND}"
+
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+"
+
+PATCHES=( "${FILESDIR}"/${PN}-4.18-darwin.patch )
+DOCS=( "${S}"/{ChangeLog,NEWS} )
+
+src_prepare() {
+	# Sub-slot sanity check
+	local sub_slot=${SLOT#*/}
+	local sip_api_major_nr=$(sed -nre 's:^#define SIP_API_MAJOR_NR\s+([0-9]+):\1:p' siplib/sip.h.in)
+	if [[ ${sub_slot} != ${sip_api_major_nr} ]]; then
+		eerror
+		eerror "Ebuild sub-slot (${sub_slot}) does not match SIP_API_MAJOR_NR (${sip_api_major_nr})"
+		eerror "Please update SLOT variable as follows:"
+		eerror "    SLOT=\"${SLOT%%/*}/${sip_api_major_nr}\""
+		eerror
+		die "sub-slot sanity check failed"
+	fi
+
+	# Fix out-of-source installation of sip.pyi
+	sed -i -e '/installs.*sip\.pyi/ s/build_dir/src_dir/' configure.py || die
+
+	default
+}
+
+src_configure() {
+	configuration() {
+		local myconf=(
+			"${PYTHON}"
+			"${S}"/configure.py
+			--bindir="${EPREFIX}/usr/bin"
+			--destdir="$(python_get_sitedir)"
+			--incdir="$(python_get_includedir)"
+			$(usex debug --debug '')
+			AR="$(tc-getAR) cqs"
+			CC="$(tc-getCC)"
+			CFLAGS="${CFLAGS}"
+			CFLAGS_RELEASE=
+			CXX="$(tc-getCXX)"
+			CXXFLAGS="${CXXFLAGS}"
+			CXXFLAGS_RELEASE=
+			LINK="$(tc-getCXX)"
+			LINK_SHLIB="$(tc-getCXX)"
+			LFLAGS="${LDFLAGS}"
+			LFLAGS_RELEASE=
+			RANLIB=
+			STRIP=
+		)
+		echo "${myconf[@]}"
+		"${myconf[@]}" || die
+	}
+	python_foreach_impl run_in_build_dir configuration
+}
+
+src_compile() {
+	python_foreach_impl run_in_build_dir default
+}
+
+src_install() {
+	installation() {
+		default
+		python_optimize
+	}
+	python_foreach_impl run_in_build_dir installation
+
+	use doc && dodoc -r doc/html
+}
diff --git a/dev-python/sip/sip-4.9999.ebuild b/dev-python/sip/sip-4.9999.ebuild
index f7b9c0da8553..aa6c00622cea 100644
--- a/dev-python/sip/sip-4.9999.ebuild
+++ b/dev-python/sip/sip-4.9999.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
 
-inherit eutils mercurial python-r1 toolchain-funcs
+inherit python-r1 toolchain-funcs mercurial
 
 DESCRIPTION="Python extension module generator for C and C++ libraries"
 HOMEPAGE="http://www.riverbankcomputing.com/software/sip/intro https://pypi.python.org/pypi/SIP"
@@ -30,9 +30,10 @@ REQUIRED_USE="
 	|| ( $(python_gen_useflags 'python2*') )
 "
 
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-4.15.5-darwin.patch
+PATCHES=( "${FILESDIR}"/${PN}-4.18-darwin.patch )
+DOCS=( "${S}"/{ChangeLog,NEWS} )
 
+src_prepare() {
 	python_setup 'python2*'
 	"${PYTHON}" build.py prepare || die
 	if use doc; then
@@ -50,6 +51,8 @@ src_prepare() {
 		eerror
 		die "sub-slot sanity check failed"
 	fi
+
+	default
 }
 
 src_configure() {
@@ -57,9 +60,10 @@ src_configure() {
 		local myconf=(
 			"${PYTHON}"
 			"${S}"/configure.py
+			--bindir="${EPREFIX}/usr/bin"
 			--destdir="$(python_get_sitedir)"
 			--incdir="$(python_get_includedir)"
-			$(use debug && echo --debug)
+			$(usex debug --debug '')
 			AR="$(tc-getAR) cqs"
 			CC="$(tc-getCC)"
 			CFLAGS="${CFLAGS}"
@@ -86,11 +90,10 @@ src_compile() {
 
 src_install() {
 	installation() {
-		emake DESTDIR="${D}" install
+		default
 		python_optimize
 	}
 	python_foreach_impl run_in_build_dir installation
 
-	dodoc ChangeLog NEWS
 	use doc && dodoc -r doc/html
 }
diff --git a/dev-ruby/activesupport/activesupport-4.2.6-r1.ebuild b/dev-ruby/activesupport/activesupport-4.2.6-r1.ebuild
new file mode 100644
index 000000000000..f3add095a323
--- /dev/null
+++ b/dev-ruby/activesupport/activesupport-4.2.6-r1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+USE_RUBY="ruby20 ruby21 ruby22 ruby23"
+
+RUBY_FAKEGEM_TASK_DOC=""
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="activesupport.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem versionator
+
+DESCRIPTION="Utility Classes and Extension to the Standard Library"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(get_version_component_range 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+	>=dev-ruby/i18n-0.7:0.7
+	>=dev-ruby/json-1.7.7:0
+	>=dev-ruby/tzinfo-1.1:1
+	>=dev-ruby/minitest-5.1:5
+	>=dev-ruby/thread_safe-0.3.4:0"
+
+# memcache-client, nokogiri, and builder are not strictly
+# needed, but there are tests using this code.
+ruby_add_bdepend "test? (
+	>=dev-ruby/dalli-2.2.1
+	>=dev-ruby/nokogiri-1.4.5
+	>=dev-ruby/builder-3.1.0
+	dev-ruby/rack
+	dev-ruby/mocha:0.14
+	)"
+
+all_ruby_prepare() {
+	# Set the secure permissions that tests expect.
+	chmod 0755 "${HOME}" || die "Failed to fix permissions on home"
+
+	# Remove items from the common Gemfile that we don't need for this
+	# test run. This also requires handling some gemspecs.
+	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|mysql\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|minitest\|sprockets\|stackprof\|rack-cache\|sqlite\)/ s:^:#:" \
+		-e '/:job/,/end/ s:^:#:' \
+		-e '/group :doc/,/^end/ s:^:#:' \
+		-e 's/gemspec/gemspec path: "activesupport"/' \
+		-e '5igem "builder"; gem "rack"' ../Gemfile || die
+	rm ../Gemfile.lock || die
+
+	# Avoid test that seems to be broken by lack of DST.
+	sed -i -e '369 s:^:#:' test/core_ext/string_ext_test.rb || die
+
+	# Avoid test that fails with Minitest 5.4 since that already defines
+	# a string E in its TestCase.
+	rm test/core_ext/marshal_test.rb || die
+	sed -i -e '/test_const_missing_in_anonymous_modules/askip "gentoo minitest"' test/dependencies_test.rb || die
+}
diff --git a/dev-ruby/builder/builder-3.0.4-r1.ebuild b/dev-ruby/builder/builder-3.0.4-r1.ebuild
index c5518ad67d72..a3533a6e51bb 100644
--- a/dev-ruby/builder/builder-3.0.4-r1.ebuild
+++ b/dev-ruby/builder/builder-3.0.4-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
-USE_RUBY="ruby19 ruby20"
+USE_RUBY="ruby20"
 
 RUBY_FAKEGEM_TASK_TEST="test_all"
 
diff --git a/dev-ruby/builder/builder-3.0.4-r2.ebuild b/dev-ruby/builder/builder-3.0.4-r2.ebuild
index d55332224ab0..48c1e324cfeb 100644
--- a/dev-ruby/builder/builder-3.0.4-r2.ebuild
+++ b/dev-ruby/builder/builder-3.0.4-r2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
 # ruby22 - code incompatability
-USE_RUBY="ruby19 ruby20 ruby21"
+USE_RUBY="ruby20 ruby21"
 
 RUBY_FAKEGEM_TASK_TEST="test_all"
 
diff --git a/dev-ruby/builder/builder-3.1.4.ebuild b/dev-ruby/builder/builder-3.1.4.ebuild
index c697fa00e1cc..c81f51eff438 100644
--- a/dev-ruby/builder/builder-3.1.4.ebuild
+++ b/dev-ruby/builder/builder-3.1.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21"
+USE_RUBY="ruby20 ruby21"
 
 RUBY_FAKEGEM_TASK_TEST="test_all"
 
diff --git a/dev-ruby/builder/builder-3.2.2.ebuild b/dev-ruby/builder/builder-3.2.2.ebuild
index 20cf008e913d..78f4c594c91e 100644
--- a/dev-ruby/builder/builder-3.2.2.ebuild
+++ b/dev-ruby/builder/builder-3.2.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
-USE_RUBY="ruby19 ruby20"
+USE_RUBY="ruby20"
 
 RUBY_FAKEGEM_TASK_TEST="test_all"
 
diff --git a/dev-ruby/bundler/bundler-1.10.6.ebuild b/dev-ruby/bundler/bundler-1.10.6.ebuild
index 3bad3fb6dd22..f382f6f9674a 100644
--- a/dev-ruby/bundler/bundler-1.10.6.ebuild
+++ b/dev-ruby/bundler/bundler-1.10.6.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
 
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22"
 
 #RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/bundler/bundler-1.8.9.ebuild b/dev-ruby/bundler/bundler-1.8.9.ebuild
index 5516a3007b62..b290150ca3bf 100644
--- a/dev-ruby/bundler/bundler-1.8.9.ebuild
+++ b/dev-ruby/bundler/bundler-1.8.9.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
 
-USE_RUBY="ruby19 ruby20"
+USE_RUBY="ruby20"
 
 #RUBY_FAKEGEM_RECIPE_TEST="rspec"
 
diff --git a/dev-ruby/bundler/bundler-1.9.10.ebuild b/dev-ruby/bundler/bundler-1.9.10.ebuild
index 724f6ce4866c..8cd3a38e4591 100644
--- a/dev-ruby/bundler/bundler-1.9.10.ebuild
+++ b/dev-ruby/bundler/bundler-1.9.10.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
 
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22"
 
 #RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/capistrano/capistrano-2.15.5-r1.ebuild b/dev-ruby/capistrano/capistrano-2.15.5-r1.ebuild
index 723c1f9ba14c..0787af390039 100644
--- a/dev-ruby/capistrano/capistrano-2.15.5-r1.ebuild
+++ b/dev-ruby/capistrano/capistrano-2.15.5-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
-USE_RUBY="ruby19 ruby20"
+USE_RUBY="ruby20"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.md"
diff --git a/dev-ruby/capistrano/capistrano-2.15.5-r2.ebuild b/dev-ruby/capistrano/capistrano-2.15.5-r2.ebuild
index 674482178060..bcd6126ac07d 100644
--- a/dev-ruby/capistrano/capistrano-2.15.5-r2.ebuild
+++ b/dev-ruby/capistrano/capistrano-2.15.5-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.md"
diff --git a/dev-ruby/capistrano/capistrano-3.3.5.ebuild b/dev-ruby/capistrano/capistrano-3.3.5.ebuild
index dcc15d193249..dfd0d46d3085 100644
--- a/dev-ruby/capistrano/capistrano-3.3.5.ebuild
+++ b/dev-ruby/capistrano/capistrano-3.3.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21"
+USE_RUBY="ruby20 ruby21"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec"
 
diff --git a/dev-ruby/capistrano/capistrano-3.4.0.ebuild b/dev-ruby/capistrano/capistrano-3.4.0.ebuild
index bb3d7e2055a4..56e1a93d3d94 100644
--- a/dev-ruby/capistrano/capistrano-3.4.0.ebuild
+++ b/dev-ruby/capistrano/capistrano-3.4.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21"
+USE_RUBY="ruby20 ruby21"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec"
 
diff --git a/dev-ruby/dalli/dalli-2.7.6.ebuild b/dev-ruby/dalli/dalli-2.7.6.ebuild
index 2ce7c5fff20f..120b89b4c161 100644
--- a/dev-ruby/dalli/dalli-2.7.6.ebuild
+++ b/dev-ruby/dalli/dalli-2.7.6.ebuild
@@ -3,7 +3,7 @@
 # $Id$
 
 EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22 ruby23"
 
 RUBY_FAKEGEM_TASK_TEST="test"
 
diff --git a/dev-ruby/database_cleaner/database_cleaner-1.4.1.ebuild b/dev-ruby/database_cleaner/database_cleaner-1.4.1.ebuild
index a832f4934335..8fa78719e124 100644
--- a/dev-ruby/database_cleaner/database_cleaner-1.4.1.ebuild
+++ b/dev-ruby/database_cleaner/database_cleaner-1.4.1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
 
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_TASK_DOC="examples"
diff --git a/dev-ruby/database_cleaner/database_cleaner-1.5.0.ebuild b/dev-ruby/database_cleaner/database_cleaner-1.5.0.ebuild
index a832f4934335..8fa78719e124 100644
--- a/dev-ruby/database_cleaner/database_cleaner-1.5.0.ebuild
+++ b/dev-ruby/database_cleaner/database_cleaner-1.5.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
 
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_TASK_DOC="examples"
diff --git a/dev-ruby/database_cleaner/database_cleaner-1.5.1.ebuild b/dev-ruby/database_cleaner/database_cleaner-1.5.1.ebuild
index a832f4934335..8fa78719e124 100644
--- a/dev-ruby/database_cleaner/database_cleaner-1.5.1.ebuild
+++ b/dev-ruby/database_cleaner/database_cleaner-1.5.1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
 
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_TASK_DOC="examples"
diff --git a/dev-ruby/date_validator/date_validator-0.8.0.ebuild b/dev-ruby/date_validator/date_validator-0.8.0.ebuild
index 126bff1635d0..53d1866549d5 100644
--- a/dev-ruby/date_validator/date_validator-0.8.0.ebuild
+++ b/dev-ruby/date_validator/date_validator-0.8.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21"
+USE_RUBY="ruby20 ruby21"
 
 RUBY_FAKEGEM_TASK_TEST="test"
 
diff --git a/dev-ruby/date_validator/date_validator-0.8.1.ebuild b/dev-ruby/date_validator/date_validator-0.8.1.ebuild
index 126bff1635d0..53d1866549d5 100644
--- a/dev-ruby/date_validator/date_validator-0.8.1.ebuild
+++ b/dev-ruby/date_validator/date_validator-0.8.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21"
+USE_RUBY="ruby20 ruby21"
 
 RUBY_FAKEGEM_TASK_TEST="test"
 
diff --git a/dev-ruby/facter/facter-2.4.1-r1.ebuild b/dev-ruby/facter/facter-2.4.1-r1.ebuild
index 7986ce94fa0d..435b30e085c8 100644
--- a/dev-ruby/facter/facter-2.4.1-r1.ebuild
+++ b/dev-ruby/facter/facter-2.4.1-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
 
-USE_RUBY="ruby19 ruby20 ruby21"
+USE_RUBY="ruby20 ruby21"
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_RECIPE_TEST="rspec"
 RUBY_FAKEGEM_EXTRADOC="README.md"
diff --git a/dev-ruby/facter/facter-2.4.1.ebuild b/dev-ruby/facter/facter-2.4.1.ebuild
index 991757c3645c..a9f877753a6f 100644
--- a/dev-ruby/facter/facter-2.4.1.ebuild
+++ b/dev-ruby/facter/facter-2.4.1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
 
-USE_RUBY="ruby19 ruby20"
+USE_RUBY="ruby20"
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_RECIPE_TEST="rspec"
 RUBY_FAKEGEM_EXTRADOC="README.md"
diff --git a/dev-ruby/facter/facter-2.4.3.ebuild b/dev-ruby/facter/facter-2.4.3.ebuild
index 3e8ea45cb905..2e25d5f8bf36 100644
--- a/dev-ruby/facter/facter-2.4.3.ebuild
+++ b/dev-ruby/facter/facter-2.4.3.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
 
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22"
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_RECIPE_TEST="rspec"
 RUBY_FAKEGEM_EXTRADOC="README.md"
diff --git a/dev-ruby/facter/facter-2.4.4.ebuild b/dev-ruby/facter/facter-2.4.4.ebuild
index 3e8ea45cb905..2e25d5f8bf36 100644
--- a/dev-ruby/facter/facter-2.4.4.ebuild
+++ b/dev-ruby/facter/facter-2.4.4.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
 
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22"
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_RECIPE_TEST="rspec"
 RUBY_FAKEGEM_EXTRADOC="README.md"
diff --git a/dev-ruby/facter/facter-3.0.2-r1.ebuild b/dev-ruby/facter/facter-3.0.2-r1.ebuild
index d27a6ebb5948..7b0877df0d6f 100644
--- a/dev-ruby/facter/facter-3.0.2-r1.ebuild
+++ b/dev-ruby/facter/facter-3.0.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22"
 
 inherit cmake-utils ruby-ng
 
diff --git a/dev-ruby/facter/facter-3.1.2.ebuild b/dev-ruby/facter/facter-3.1.2.ebuild
index 7e9cf4fde45c..340d8d217b1e 100644
--- a/dev-ruby/facter/facter-3.1.2.ebuild
+++ b/dev-ruby/facter/facter-3.1.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22"
 
 inherit cmake-utils ruby-ng
 
diff --git a/dev-ruby/facter/facter-3.1.3.ebuild b/dev-ruby/facter/facter-3.1.3.ebuild
index 7e9cf4fde45c..340d8d217b1e 100644
--- a/dev-ruby/facter/facter-3.1.3.ebuild
+++ b/dev-ruby/facter/facter-3.1.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22"
 
 inherit cmake-utils ruby-ng
 
diff --git a/dev-ruby/flexmock/flexmock-1.3.3-r1.ebuild b/dev-ruby/flexmock/flexmock-1.3.3-r1.ebuild
index 9e89c7bd2403..fabdc2015c7c 100644
--- a/dev-ruby/flexmock/flexmock-1.3.3-r1.ebuild
+++ b/dev-ruby/flexmock/flexmock-1.3.3-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
 # ruby22 -> fails specs
-USE_RUBY="ruby19 ruby20 ruby21"
+USE_RUBY="ruby20 ruby21"
 
 RUBY_FAKEGEM_DOCDIR="html"
 RUBY_FAKEGEM_EXTRADOC="CHANGES README.md doc/*.rdoc doc/releases/*"
diff --git a/dev-ruby/flexmock/flexmock-1.3.3.ebuild b/dev-ruby/flexmock/flexmock-1.3.3.ebuild
index 5000b7d09762..970198fd7764 100644
--- a/dev-ruby/flexmock/flexmock-1.3.3.ebuild
+++ b/dev-ruby/flexmock/flexmock-1.3.3.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
 # ruby22 -> fails specs
-USE_RUBY="ruby19 ruby20"
+USE_RUBY="ruby20"
 
 RUBY_FAKEGEM_DOCDIR="html"
 RUBY_FAKEGEM_EXTRADOC="CHANGES README.md doc/*.rdoc doc/releases/*"
diff --git a/dev-ruby/gherkin/gherkin-2.12.0-r2.ebuild b/dev-ruby/gherkin/gherkin-2.12.0-r2.ebuild
index 79414095d696..99bd5b7d164c 100644
--- a/dev-ruby/gherkin/gherkin-2.12.0-r2.ebuild
+++ b/dev-ruby/gherkin/gherkin-2.12.0-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
-USE_RUBY="ruby19 ruby20"
+USE_RUBY="ruby20"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_TASK_TEST=""
diff --git a/dev-ruby/gherkin/gherkin-2.12.0-r3.ebuild b/dev-ruby/gherkin/gherkin-2.12.0-r3.ebuild
index 158c8a1407f4..3f5ff9b16458 100644
--- a/dev-ruby/gherkin/gherkin-2.12.0-r3.ebuild
+++ b/dev-ruby/gherkin/gherkin-2.12.0-r3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_TASK_TEST=""
diff --git a/dev-ruby/gherkin/gherkin-2.12.2.ebuild b/dev-ruby/gherkin/gherkin-2.12.2.ebuild
index 004e57a85f7b..d6bcc9e071f6 100644
--- a/dev-ruby/gherkin/gherkin-2.12.2.ebuild
+++ b/dev-ruby/gherkin/gherkin-2.12.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_TASK_TEST=""
diff --git a/dev-ruby/hiera-eyaml-gpg/hiera-eyaml-gpg-0.4.ebuild b/dev-ruby/hiera-eyaml-gpg/hiera-eyaml-gpg-0.4.ebuild
index 7f3baf353cf6..ee7ffc47accb 100644
--- a/dev-ruby/hiera-eyaml-gpg/hiera-eyaml-gpg-0.4.ebuild
+++ b/dev-ruby/hiera-eyaml-gpg/hiera-eyaml-gpg-0.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21"
+USE_RUBY="ruby20 ruby21"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_EXTRADOC="README.md"
diff --git a/dev-ruby/hiera-eyaml-gpg/hiera-eyaml-gpg-0.5.ebuild b/dev-ruby/hiera-eyaml-gpg/hiera-eyaml-gpg-0.5.ebuild
index c2ccc18da749..eb9be77cdc51 100644
--- a/dev-ruby/hiera-eyaml-gpg/hiera-eyaml-gpg-0.5.ebuild
+++ b/dev-ruby/hiera-eyaml-gpg/hiera-eyaml-gpg-0.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21"
+USE_RUBY="ruby20 ruby21"
 
 RUBY_FAKEGEM_TASK_TEST=""
 
diff --git a/dev-ruby/hiera-eyaml-gpg/hiera-eyaml-gpg-0.6.ebuild b/dev-ruby/hiera-eyaml-gpg/hiera-eyaml-gpg-0.6.ebuild
index c2ccc18da749..eb9be77cdc51 100644
--- a/dev-ruby/hiera-eyaml-gpg/hiera-eyaml-gpg-0.6.ebuild
+++ b/dev-ruby/hiera-eyaml-gpg/hiera-eyaml-gpg-0.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21"
+USE_RUBY="ruby20 ruby21"
 
 RUBY_FAKEGEM_TASK_TEST=""
 
diff --git a/dev-ruby/hiera/hiera-1.3.4-r1.ebuild b/dev-ruby/hiera/hiera-1.3.4-r1.ebuild
index 094944b954c4..e84a05d2a7bc 100644
--- a/dev-ruby/hiera/hiera-1.3.4-r1.ebuild
+++ b/dev-ruby/hiera/hiera-1.3.4-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
 
-USE_RUBY="ruby19 ruby20 ruby21"
+USE_RUBY="ruby20 ruby21"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec"
 
diff --git a/dev-ruby/hiera/hiera-1.3.4.ebuild b/dev-ruby/hiera/hiera-1.3.4.ebuild
index d4a330a658a0..16811558b5c9 100644
--- a/dev-ruby/hiera/hiera-1.3.4.ebuild
+++ b/dev-ruby/hiera/hiera-1.3.4.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
 
-USE_RUBY="ruby19 ruby20"
+USE_RUBY="ruby20"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec"
 
diff --git a/dev-ruby/hiera/hiera-2.0.0.ebuild b/dev-ruby/hiera/hiera-2.0.0.ebuild
index d9c0eeff6e8a..54e5bcd5b2e6 100644
--- a/dev-ruby/hiera/hiera-2.0.0.ebuild
+++ b/dev-ruby/hiera/hiera-2.0.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
 
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec"
 
diff --git a/dev-ruby/hiera/hiera-3.0.1-r1.ebuild b/dev-ruby/hiera/hiera-3.0.1-r1.ebuild
index 13a8945c624e..00e384009cdd 100644
--- a/dev-ruby/hiera/hiera-3.0.1-r1.ebuild
+++ b/dev-ruby/hiera/hiera-3.0.1-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
 
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec"
 
diff --git a/dev-ruby/hike/hike-1.2.3-r1.ebuild b/dev-ruby/hike/hike-1.2.3-r1.ebuild
index a88c13ccc968..57d781b17e00 100644
--- a/dev-ruby/hike/hike-1.2.3-r1.ebuild
+++ b/dev-ruby/hike/hike-1.2.3-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22"
 
 RUBY_FAKEGEM_TASK_TEST="none"
 
diff --git a/dev-ruby/hike/hike-1.2.3.ebuild b/dev-ruby/hike/hike-1.2.3.ebuild
index 5b3aa211adcf..4e64c588a509 100644
--- a/dev-ruby/hike/hike-1.2.3.ebuild
+++ b/dev-ruby/hike/hike-1.2.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
-USE_RUBY="ruby19 ruby20"
+USE_RUBY="ruby20"
 
 RUBY_FAKEGEM_TASK_TEST="none"
 
diff --git a/dev-ruby/hike/hike-2.1.2.ebuild b/dev-ruby/hike/hike-2.1.2.ebuild
index 86117565dcde..15900310de55 100644
--- a/dev-ruby/hike/hike-2.1.2.ebuild
+++ b/dev-ruby/hike/hike-2.1.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22"
 
 RUBY_FAKEGEM_TASK_TEST="test"
 
diff --git a/dev-ruby/hipchat/hipchat-1.5.2.ebuild b/dev-ruby/hipchat/hipchat-1.5.2.ebuild
index d9e78f35a3c8..cb88911c6d4f 100644
--- a/dev-ruby/hipchat/hipchat-1.5.2.ebuild
+++ b/dev-ruby/hipchat/hipchat-1.5.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21"
+USE_RUBY="ruby20 ruby21"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
diff --git a/dev-ruby/hitimes/hitimes-1.2.2.ebuild b/dev-ruby/hitimes/hitimes-1.2.2.ebuild
index b61194f71125..fdb7caed29df 100644
--- a/dev-ruby/hitimes/hitimes-1.2.2.ebuild
+++ b/dev-ruby/hitimes/hitimes-1.2.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_EXTRADOC="README.md HISTORY.md"
diff --git a/dev-ruby/hitimes/hitimes-1.2.3.ebuild b/dev-ruby/hitimes/hitimes-1.2.3.ebuild
index b61194f71125..fdb7caed29df 100644
--- a/dev-ruby/hitimes/hitimes-1.2.3.ebuild
+++ b/dev-ruby/hitimes/hitimes-1.2.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_EXTRADOC="README.md HISTORY.md"
diff --git a/dev-ruby/http-form_data/http-form_data-1.0.1.ebuild b/dev-ruby/http-form_data/http-form_data-1.0.1.ebuild
index c1cb8cb33e57..f661acaf94df 100644
--- a/dev-ruby/http-form_data/http-form_data-1.0.1.ebuild
+++ b/dev-ruby/http-form_data/http-form_data-1.0.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/i18n/i18n-0.7.0-r2.ebuild b/dev-ruby/i18n/i18n-0.7.0-r2.ebuild
new file mode 100644
index 000000000000..9bb8c86621f7
--- /dev/null
+++ b/dev-ruby/i18n/i18n-0.7.0-r2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+USE_RUBY="ruby20 ruby21 ruby22 ruby23"
+
+RUBY_FAKEGEM_RECIPE_TEST="test"
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem versionator
+
+DESCRIPTION="Add Internationalization support to your Ruby application"
+HOMEPAGE="http://rails-i18n.org/"
+SRC_URI="https://github.com/svenfuchs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(get_version_component_range 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RUBY_PATCHES=( ${P}-frozen-classes.patch )
+
+ruby_add_bdepend "test? (
+	>=dev-ruby/activesupport-3.2 <dev-ruby/activesupport-4.3
+	dev-ruby/bundler
+	>=dev-ruby/mocha-0.13
+	dev-ruby/test_declarative )"
+
+all_ruby_prepare() {
+	# Remove bundler lock files since we cannot depend on specific
+	# versions in Gentoo.
+	rm gemfiles/*.lock || die
+}
+
+each_ruby_test() {
+	case ${RUBY} in
+		*ruby22|*ruby23)
+			versions="4.2"
+			;;
+		*)
+			versions="3.2 4.0 4.1 4.2"
+			;;
+	esac
+
+	for version in ${versions} ; do
+		if has_version "dev-ruby/activesupport:${version}" ; then
+			einfo "Running tests with activesupport ${version}"
+			BUNDLE_GEMFILE="${S}/gemfiles/Gemfile.rails-${version}.x" ${RUBY} -S bundle exec ${RUBY} -S rake test || die
+		fi
+	done
+}
diff --git a/dev-ruby/jsobfu/jsobfu-0.2.1-r1.ebuild b/dev-ruby/jsobfu/jsobfu-0.2.1-r1.ebuild
index 3cc76e8c0fd2..fcf1309ee75f 100644
--- a/dev-ruby/jsobfu/jsobfu-0.2.1-r1.ebuild
+++ b/dev-ruby/jsobfu/jsobfu-0.2.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22"
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_RECIPE_TEST="rspec"
 RUBY_FAKEGEM_BINWRAP=""
diff --git a/dev-ruby/jsobfu/jsobfu-0.2.1.ebuild b/dev-ruby/jsobfu/jsobfu-0.2.1.ebuild
index b20332bf5979..09d156773fbf 100644
--- a/dev-ruby/jsobfu/jsobfu-0.2.1.ebuild
+++ b/dev-ruby/jsobfu/jsobfu-0.2.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 
diff --git a/dev-ruby/jsobfu/jsobfu-0.3.0-r1.ebuild b/dev-ruby/jsobfu/jsobfu-0.3.0-r1.ebuild
index a8630dacb453..0933e81e8705 100644
--- a/dev-ruby/jsobfu/jsobfu-0.3.0-r1.ebuild
+++ b/dev-ruby/jsobfu/jsobfu-0.3.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 
diff --git a/dev-ruby/jsobfu/jsobfu-0.3.0.ebuild b/dev-ruby/jsobfu/jsobfu-0.3.0.ebuild
index 82eda577e5fa..9d0c6fef2a27 100644
--- a/dev-ruby/jsobfu/jsobfu-0.3.0.ebuild
+++ b/dev-ruby/jsobfu/jsobfu-0.3.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22"
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 RUBY_FAKEGEM_BINWRAP=""
diff --git a/dev-ruby/liquid/liquid-2.6.2.ebuild b/dev-ruby/liquid/liquid-2.6.2.ebuild
index 151ebf942a90..d93e0f531662 100644
--- a/dev-ruby/liquid/liquid-2.6.2.ebuild
+++ b/dev-ruby/liquid/liquid-2.6.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_TASK_TEST=""
diff --git a/dev-ruby/liquid/liquid-3.0.4.ebuild b/dev-ruby/liquid/liquid-3.0.4.ebuild
index 24f8b98b44d9..5827e2782415 100644
--- a/dev-ruby/liquid/liquid-3.0.4.ebuild
+++ b/dev-ruby/liquid/liquid-3.0.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21"
+USE_RUBY="ruby20 ruby21"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_EXTRADOC="History.md README.md"
diff --git a/dev-ruby/liquid/liquid-3.0.6.ebuild b/dev-ruby/liquid/liquid-3.0.6.ebuild
index 24f8b98b44d9..5827e2782415 100644
--- a/dev-ruby/liquid/liquid-3.0.6.ebuild
+++ b/dev-ruby/liquid/liquid-3.0.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21"
+USE_RUBY="ruby20 ruby21"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_EXTRADOC="History.md README.md"
diff --git a/dev-ruby/listen/listen-0.7.3-r1.ebuild b/dev-ruby/listen/listen-0.7.3-r1.ebuild
index 78d2c9814c59..985f8e2c1d9d 100644
--- a/dev-ruby/listen/listen-0.7.3-r1.ebuild
+++ b/dev-ruby/listen/listen-0.7.3-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
 
-USE_RUBY="ruby19 ruby20"
+USE_RUBY="ruby20"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec"
 
diff --git a/dev-ruby/listen/listen-1.3.1-r2.ebuild b/dev-ruby/listen/listen-1.3.1-r2.ebuild
index 992e118a2846..f9c549ee67cc 100644
--- a/dev-ruby/listen/listen-1.3.1-r2.ebuild
+++ b/dev-ruby/listen/listen-1.3.1-r2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
 
-USE_RUBY="ruby19 ruby20"
+USE_RUBY="ruby20"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec"
 
diff --git a/dev-ruby/logue/logue-1.0.2-r1.ebuild b/dev-ruby/logue/logue-1.0.2-r1.ebuild
deleted file mode 100644
index 28fcc610f3e4..000000000000
--- a/dev-ruby/logue/logue-1.0.2-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-# ruby22 -> code is not compatible.
-USE_RUBY="ruby19 ruby20"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="Features.txt History.txt README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A module that adds logging/trace functionality"
-HOMEPAGE="https://github.com/jpace/logue"
-
-SRC_URI="https://github.com/jpace/logue/archive/v${PV}.tar.gz -> ${PN}-git-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 hppa ~ppc ~sparc x86"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/rainbow-2.0.0"
-
-all_ruby_prepare() {
-	sed -i -e "s/run_test/do_run_test/" test/logue/testlog/log_stack_test.rb || die
-}
diff --git a/dev-ruby/logue/logue-1.0.2-r2.ebuild b/dev-ruby/logue/logue-1.0.2-r2.ebuild
index 6e4ef5fe3883..6e6b33d8c8e7 100644
--- a/dev-ruby/logue/logue-1.0.2-r2.ebuild
+++ b/dev-ruby/logue/logue-1.0.2-r2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
 
 # ruby22 -> code is not compatible.
-USE_RUBY="ruby19 ruby20 ruby21"
+USE_RUBY="ruby20 ruby21"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_DOCDIR="doc"
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/jpace/logue/archive/v${PV}.tar.gz -> ${PN}-git-${PV}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
+KEYWORDS="amd64 hppa ~ppc ~sparc x86"
 IUSE=""
 
 ruby_add_rdepend ">=dev-ruby/rainbow-2.0.0"
diff --git a/dev-ruby/mime-types/mime-types-1.25.1.ebuild b/dev-ruby/mime-types/mime-types-1.25.1.ebuild
index 917c9b13dc2a..dd1f9a51a1c6 100644
--- a/dev-ruby/mime-types/mime-types-1.25.1.ebuild
+++ b/dev-ruby/mime-types/mime-types-1.25.1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
 
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_EXTRADOC="History.rdoc README.rdoc"
diff --git a/dev-ruby/mime-types/mime-types-2.6.2.ebuild b/dev-ruby/mime-types/mime-types-2.6.2.ebuild
index 5a70489644d3..c8a0422d9a09 100644
--- a/dev-ruby/mime-types/mime-types-2.6.2.ebuild
+++ b/dev-ruby/mime-types/mime-types-2.6.2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
 
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_EXTRADOC="History.rdoc History-Types.rdoc README.rdoc"
diff --git a/dev-ruby/pg_array_parser/pg_array_parser-0.0.9-r1.ebuild b/dev-ruby/pg_array_parser/pg_array_parser-0.0.9-r1.ebuild
index e70da9808075..da143f8882c4 100644
--- a/dev-ruby/pg_array_parser/pg_array_parser-0.0.9-r1.ebuild
+++ b/dev-ruby/pg_array_parser/pg_array_parser-0.0.9-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/pluggaloid/Manifest b/dev-ruby/pluggaloid/Manifest
index 02fa8e103c8b..027563890e31 100644
--- a/dev-ruby/pluggaloid/Manifest
+++ b/dev-ruby/pluggaloid/Manifest
@@ -1 +1,2 @@
 DIST pluggaloid-1.0.2.gem 11776 SHA256 839fc393f3e249ca3772adfb8e8ea6b4fafb3b570df82d47e6cbc3999fa9f36c SHA512 e9ba908f477bf254e7c3ae9f3736d21aeeb38848bcbd43e2ab995c3d592547c22572d07965096353d82ef38e81d4a489a495e80f9af3927fc937caa04d435275 WHIRLPOOL 9914d5b92870cf87ca26fd913df311628018bb9b93a9fe41e626b70b255f80e46a56effea216914afefc29a97aee3ae928775991e292c24d5faab5234698db43
+DIST pluggaloid-1.1.1.gem 14336 SHA256 f9279fad38d0bf4e20ee70e30882c6cb7916bc764bf72b2f955f0ac0ff0a3a5d SHA512 80453954f98c7fba354455b73538d055a7d9d38e38f16723dcc4b04811286a8e34e413f31d988b86580eb5a4890d5405c78e6798bcf1ca489fd3159b23653070 WHIRLPOOL 9c020c4a11dcaa49f21a086e4fb050f7798beb3465e8db3fb79521f168ae5e072b6c03a6a93dd233cd59422355c76d567d0fa5524e9cc45a8eef7e8d8b5a7586
diff --git a/dev-ruby/pluggaloid/pluggaloid-1.1.1.ebuild b/dev-ruby/pluggaloid/pluggaloid-1.1.1.ebuild
new file mode 100644
index 000000000000..da3794fd2c4f
--- /dev/null
+++ b/dev-ruby/pluggaloid/pluggaloid-1.1.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+USE_RUBY="ruby21 ruby22 ruby23"
+
+RUBY_FAKEGEM_RECIPE_DOC="doc"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+DESCRIPTION="Pluggaloid is extensible plugin system for mikutter"
+HOMEPAGE="https://rubygems.org/gems/pluggaloid/"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+ruby_add_rdepend "
+	dev-ruby/delayer
+	dev-ruby/instance_storage:0
+"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/ s:^:#:' Rakefile test/*_test.rb || die
+}
diff --git a/dev-ruby/prawn/prawn-1.3.0.ebuild b/dev-ruby/prawn/prawn-1.3.0.ebuild
index f413a863251e..36b6daf23e7f 100644
--- a/dev-ruby/prawn/prawn-1.3.0.ebuild
+++ b/dev-ruby/prawn/prawn-1.3.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21"
+USE_RUBY="ruby20 ruby21"
 
 RUBY_FAKEGEM_RECIPE_DOC="yard"
 RUBY_FAKEGEM_RECIPE_TEST="rspec"
diff --git a/dev-ruby/prawn/prawn-2.0.2.ebuild b/dev-ruby/prawn/prawn-2.0.2.ebuild
index 1ce51d2de60d..4743ecd0793b 100644
--- a/dev-ruby/prawn/prawn-2.0.2.ebuild
+++ b/dev-ruby/prawn/prawn-2.0.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22"
 
 RUBY_FAKEGEM_RECIPE_DOC="yard"
 RUBY_FAKEGEM_RECIPE_TEST="rspec"
diff --git a/dev-ruby/racc/racc-1.4.11.ebuild b/dev-ruby/racc/racc-1.4.11.ebuild
index 029e7a846c36..736a87c39505 100644
--- a/dev-ruby/racc/racc-1.4.11.ebuild
+++ b/dev-ruby/racc/racc-1.4.11.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
 
-USE_RUBY="ruby19 ruby20 ruby21"
+USE_RUBY="ruby20 ruby21"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_TASK_DOC="docs"
diff --git a/dev-ruby/racc/racc-1.4.12.ebuild b/dev-ruby/racc/racc-1.4.12.ebuild
index 4f4d11be291b..30d9ab1006e4 100644
--- a/dev-ruby/racc/racc-1.4.12.ebuild
+++ b/dev-ruby/racc/racc-1.4.12.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
 
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_TASK_DOC="docs"
diff --git a/dev-ruby/racc/racc-1.4.13.ebuild b/dev-ruby/racc/racc-1.4.13.ebuild
index cc8e209a16be..5aeacfb9bc46 100644
--- a/dev-ruby/racc/racc-1.4.13.ebuild
+++ b/dev-ruby/racc/racc-1.4.13.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
 
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_TASK_DOC="docs"
diff --git a/dev-ruby/rack-attack/Manifest b/dev-ruby/rack-attack/Manifest
index c912b7f807ea..6fa9d268d38c 100644
--- a/dev-ruby/rack-attack/Manifest
+++ b/dev-ruby/rack-attack/Manifest
@@ -1,3 +1 @@
-DIST rack-attack-4.3.1.gem 16384 SHA256 9a2ea5df8c9b4a715ecd6497e7553c7e50fdb1452abe724bd8ae359115621146 SHA512 6f89b7f8afb8adab09b0df984df2ad4dbd043ad73dbb7adad11a87f9f4041194bb4f63399fd5c5d15bec1ee47a682247a9f01217ada8eeda1fb09235dd00ffaa WHIRLPOOL e9f45190635229975bb02abe2f6996d6de82f7486339c3bc26ac65dfa6a6f1da5e58a1f6f92b835388ddc218ff2971dec3a223e6c6be4e06c7eb034d06e1e1d2
-DIST rack-attack-4.4.0.gem 16896 SHA256 8e20760712a51a51f9919ffd24f8c638d2e1bbe13340b61fbc0c984a4cb40d6e SHA512 2c9d0a90c99481990d2cc777dfa4875b23fab16f542645a610619f870cccca8373ffe205ff0785732045216f3b97bfbc983dedd76941a12c0e36baf0050477a3 WHIRLPOOL 6e9d131ad525f83d2d2eb699d148dfd276199fa491f86c9bca9fa399c1f6cd53390558c24f137298651d29c71483d56567f24c9d3f529e0b60d37ca0bd18fa1b
 DIST rack-attack-4.4.1.gem 16896 SHA256 81367dad64d7e7ce560b9427b0334eae674accd2cdb6d982f02875702e32fdb3 SHA512 1373cd47fdc06a1d4bfc751f3c8ca7c7394117090d190f5b58c4d7b91ac91babfc7bfed7690961ad6534ccb0ce8918f721d3e1b33902d12e686978c1c459e572 WHIRLPOOL 3ac1f89ead19272f6078cefd1df50f8a144b6c3b7a7dd9848709dae6a39e4563d367975bf26c46b7cfe5066542c17efde622653d60db0a75dc14ab7e9fbba0a7
diff --git a/dev-ruby/rack-attack/rack-attack-4.3.1.ebuild b/dev-ruby/rack-attack/rack-attack-4.3.1.ebuild
deleted file mode 100644
index 6f1acc6b9b70..000000000000
--- a/dev-ruby/rack-attack/rack-attack-4.3.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-USE_RUBY="ruby20 ruby21"
-
-# Skip integration tests since they require additional unpackaged
-# dependencies and running daemons.
-RUBY_FAKEGEM_TASK_TEST="test:units"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A DSL for blocking & throttling abusive clients"
-HOMEPAGE="https://github.com/kickstarter/rack-attack"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-ruby_add_rdepend "dev-ruby/rack:*"
-ruby_add_bdepend "test? ( dev-ruby/activesupport
-	dev-ruby/rack-test
-	dev-ruby/minitest )"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/d' Rakefile spec/spec_helper.rb || die
-}
diff --git a/dev-ruby/rack-attack/rack-attack-4.4.0.ebuild b/dev-ruby/rack-attack/rack-attack-4.4.0.ebuild
deleted file mode 100644
index 232152e9171a..000000000000
--- a/dev-ruby/rack-attack/rack-attack-4.4.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22"
-
-# Skip integration tests since they require additional unpackaged
-# dependencies and running daemons.
-RUBY_FAKEGEM_TASK_TEST="test:units"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A DSL for blocking & throttling abusive clients"
-HOMEPAGE="https://github.com/kickstarter/rack-attack"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-ruby_add_rdepend "dev-ruby/rack:*"
-ruby_add_bdepend "test? ( dev-ruby/activesupport
-	dev-ruby/rack-test
-	dev-ruby/minitest )"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/d' Rakefile spec/spec_helper.rb || die
-}
diff --git a/dev-ruby/rack-openid/rack-openid-1.3.1.ebuild b/dev-ruby/rack-openid/rack-openid-1.3.1.ebuild
index 99bb53c077ab..3579345a9034 100644
--- a/dev-ruby/rack-openid/rack-openid-1.3.1.ebuild
+++ b/dev-ruby/rack-openid/rack-openid-1.3.1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
 
-USE_RUBY="ruby19 ruby20 ruby21"
+USE_RUBY="ruby20 ruby21"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_TASK_TEST=""
diff --git a/dev-ruby/rack-openid/rack-openid-1.4.2.ebuild b/dev-ruby/rack-openid/rack-openid-1.4.2.ebuild
index 350730a18d4d..730ff37dd120 100644
--- a/dev-ruby/rack-openid/rack-openid-1.4.2.ebuild
+++ b/dev-ruby/rack-openid/rack-openid-1.4.2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
 
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_EXTRADOC="Readme.md"
diff --git a/dev-ruby/ragol/ragol-1.0.1-r1.ebuild b/dev-ruby/ragol/ragol-1.0.1-r1.ebuild
deleted file mode 100644
index 6eec81898c5b..000000000000
--- a/dev-ruby/ragol/ragol-1.0.1-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-USE_RUBY="ruby19 ruby20"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="Features.txt History.txt NEWS README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Another implementation of an option processor"
-HOMEPAGE="https://github.com/jpace/ragol"
-
-SRC_URI="https://github.com/jpace/ragol/archive/v${PV}.tar.gz -> ${PN}-git-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 hppa ~ppc ~sparc x86"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/logue-1.0.0"
diff --git a/dev-ruby/ragol/ragol-1.0.1-r2.ebuild b/dev-ruby/ragol/ragol-1.0.1-r2.ebuild
index 3d9e5563dabe..e1f98486980a 100644
--- a/dev-ruby/ragol/ragol-1.0.1-r2.ebuild
+++ b/dev-ruby/ragol/ragol-1.0.1-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21"
+USE_RUBY="ruby20 ruby21"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec"
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/jpace/ragol/archive/v${PV}.tar.gz -> ${PN}-git-${PV}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
+KEYWORDS="amd64 hppa ~ppc ~sparc x86"
 IUSE=""
 
 ruby_add_rdepend ">=dev-ruby/logue-1.0.0"
diff --git a/dev-ruby/rdiscount/rdiscount-1.6.8-r2.ebuild b/dev-ruby/rdiscount/rdiscount-1.6.8-r2.ebuild
index ec391e07fd10..8138387fef40 100644
--- a/dev-ruby/rdiscount/rdiscount-1.6.8-r2.ebuild
+++ b/dev-ruby/rdiscount/rdiscount-1.6.8-r2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
 
 # Has a native extension without jruby support.
-USE_RUBY="ruby19 ruby20"
+USE_RUBY="ruby20"
 
 RUBY_FAKEGEM_TASK_TEST="test:unit"
 
diff --git a/dev-ruby/rdiscount/rdiscount-1.6.8-r3.ebuild b/dev-ruby/rdiscount/rdiscount-1.6.8-r3.ebuild
index 422a773901c2..313a041c687f 100644
--- a/dev-ruby/rdiscount/rdiscount-1.6.8-r3.ebuild
+++ b/dev-ruby/rdiscount/rdiscount-1.6.8-r3.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
 
 # Has a native extension without jruby support.
-USE_RUBY="ruby19 ruby20 ruby21"
+USE_RUBY="ruby20 ruby21"
 
 RUBY_FAKEGEM_TASK_TEST="test:unit"
 
diff --git a/dev-ruby/recog/recog-2.0.14-r1.ebuild b/dev-ruby/recog/recog-2.0.14-r1.ebuild
index 6a96593e01ff..2efa64450a12 100644
--- a/dev-ruby/recog/recog-2.0.14-r1.ebuild
+++ b/dev-ruby/recog/recog-2.0.14-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22"
 RUBY_FAKEGEM_BINWRAP=""
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_EXTRADOC="README.md"
diff --git a/dev-ruby/recog/recog-2.0.6-r1.ebuild b/dev-ruby/recog/recog-2.0.6-r1.ebuild
index 217322c57732..ac954e61de9f 100644
--- a/dev-ruby/recog/recog-2.0.6-r1.ebuild
+++ b/dev-ruby/recog/recog-2.0.6-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21"
+USE_RUBY="ruby20 ruby21"
 RUBY_FAKEGEM_BINWRAP=""
 inherit ruby-fakegem
 
diff --git a/dev-ruby/rest-client/rest-client-1.8.0-r1.ebuild b/dev-ruby/rest-client/rest-client-1.8.0-r1.ebuild
index 0b12173e169f..a97ca53d4dee 100644
--- a/dev-ruby/rest-client/rest-client-1.8.0-r1.ebuild
+++ b/dev-ruby/rest-client/rest-client-1.8.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21"
+USE_RUBY="ruby20 ruby21"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec"
 
diff --git a/dev-ruby/rest-client/rest-client-1.8.0.ebuild b/dev-ruby/rest-client/rest-client-1.8.0.ebuild
index 5c6e4b8e6480..e157160e0c65 100644
--- a/dev-ruby/rest-client/rest-client-1.8.0.ebuild
+++ b/dev-ruby/rest-client/rest-client-1.8.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
-USE_RUBY="ruby19 ruby20"
+USE_RUBY="ruby20"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec"
 
diff --git a/dev-ruby/riel/riel-1.2.0-r1.ebuild b/dev-ruby/riel/riel-1.2.0-r1.ebuild
deleted file mode 100644
index d434df32830e..000000000000
--- a/dev-ruby/riel/riel-1.2.0-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-USE_RUBY="ruby19 ruby20"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="Features.txt History.txt README.md README.rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="This library extends the core Ruby libraries"
-HOMEPAGE="https://github.com/jpace/riel"
-
-SRC_URI="https://github.com/jpace/riel/archive/v${PV}.tar.gz -> ${PN}-git-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 hppa ~ppc ~sparc x86"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/rainbow-1.1.4 dev-ruby/logue"
diff --git a/dev-ruby/riel/riel-1.2.0-r2.ebuild b/dev-ruby/riel/riel-1.2.0-r2.ebuild
index b178fb53c87f..ec5c23ff02db 100644
--- a/dev-ruby/riel/riel-1.2.0-r2.ebuild
+++ b/dev-ruby/riel/riel-1.2.0-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21"
+USE_RUBY="ruby20 ruby21"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_DOCDIR="doc"
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/jpace/riel/archive/v${PV}.tar.gz -> ${PN}-git-${PV}.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
+KEYWORDS="amd64 hppa ~ppc ~sparc x86"
 IUSE=""
 
-ruby_add_rdepend ">=dev-ruby/rainbow-1.1.4 dev-ruby/logue"
+ruby_add_rdepend ">=dev-ruby/rainbow-1.1.4:* dev-ruby/logue"
diff --git a/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.4.8-r2.ebuild b/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.4.8-r2.ebuild
index 4c890d8e737e..51472ad944b8 100644
--- a/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.4.8-r2.ebuild
+++ b/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.4.8-r2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI="5"
 
-USE_RUBY="ruby19 ruby20 ruby21"
+USE_RUBY="ruby20 ruby21"
 
 RUBY_FAKEGEM_TASK_DOC=""
 
diff --git a/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.4.8.ebuild b/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.4.8.ebuild
index a40be385ffb3..6080fc835418 100644
--- a/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.4.8.ebuild
+++ b/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.4.8.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI="5"
 
-USE_RUBY="ruby19 ruby20"
+USE_RUBY="ruby20"
 
 RUBY_FAKEGEM_TASK_DOC=""
 
diff --git a/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.4.9.ebuild b/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.4.9.ebuild
index 4f5b74c26f30..7b495f90d1a0 100644
--- a/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.4.9.ebuild
+++ b/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.4.9.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI="5"
 
-USE_RUBY="ruby19 ruby20 ruby21"
+USE_RUBY="ruby20 ruby21"
 
 RUBY_FAKEGEM_TASK_DOC=""
 
diff --git a/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.5.3.ebuild b/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.5.3.ebuild
index 9edbf7a237a1..42881bdb5f34 100644
--- a/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.5.3.ebuild
+++ b/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.5.3.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI="5"
 
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22"
 
 RUBY_FAKEGEM_TASK_DOC=""
 
diff --git a/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.5.4.ebuild b/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.5.4.ebuild
index 810f8899ed68..948fc568f328 100644
--- a/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.5.4.ebuild
+++ b/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.5.4.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI="5"
 
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22"
 
 RUBY_FAKEGEM_TASK_DOC=""
 
diff --git a/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.5.5.ebuild b/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.5.5.ebuild
index 21121d05e6a7..07a33e903005 100644
--- a/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.5.5.ebuild
+++ b/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.5.5.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI="5"
 
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22"
 
 RUBY_FAKEGEM_TASK_DOC=""
 
diff --git a/dev-ruby/rspec-core/rspec-core-2.14.8-r2.ebuild b/dev-ruby/rspec-core/rspec-core-2.14.8-r2.ebuild
index dd6bd76047e3..3d835fb5d7eb 100644
--- a/dev-ruby/rspec-core/rspec-core-2.14.8-r2.ebuild
+++ b/dev-ruby/rspec-core/rspec-core-2.14.8-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
-USE_RUBY="ruby19 ruby20"
+USE_RUBY="ruby20"
 
 RUBY_FAKEGEM_TASK_TEST="none"
 RUBY_FAKEGEM_TASK_DOC="none"
diff --git a/dev-ruby/rspec-core/rspec-core-2.14.8-r4.ebuild b/dev-ruby/rspec-core/rspec-core-2.14.8-r4.ebuild
index 8f4139a5ddd1..dcdbce64ce95 100644
--- a/dev-ruby/rspec-core/rspec-core-2.14.8-r4.ebuild
+++ b/dev-ruby/rspec-core/rspec-core-2.14.8-r4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21"
+USE_RUBY="ruby20 ruby21"
 
 RUBY_FAKEGEM_TASK_TEST="none"
 RUBY_FAKEGEM_TASK_DOC="none"
diff --git a/dev-ruby/rspec-core/rspec-core-3.3.2.ebuild b/dev-ruby/rspec-core/rspec-core-3.3.2.ebuild
index 4a99fdcd2f3c..8af30ca2eea2 100644
--- a/dev-ruby/rspec-core/rspec-core-3.3.2.ebuild
+++ b/dev-ruby/rspec-core/rspec-core-3.3.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22"
 
 RUBY_FAKEGEM_TASK_TEST="none"
 RUBY_FAKEGEM_TASK_DOC="none"
diff --git a/dev-ruby/rspec-rails/rspec-rails-2.14.2.ebuild b/dev-ruby/rspec-rails/rspec-rails-2.14.2.ebuild
index 8e6cb3150fa8..e36f6d102b7f 100644
--- a/dev-ruby/rspec-rails/rspec-rails-2.14.2.ebuild
+++ b/dev-ruby/rspec-rails/rspec-rails-2.14.2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
 
-USE_RUBY="ruby19 ruby20"
+USE_RUBY="ruby20"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec"
 
diff --git a/dev-ruby/rspec-rails/rspec-rails-2.99.0.ebuild b/dev-ruby/rspec-rails/rspec-rails-2.99.0.ebuild
index a746c7f82958..75d9656dd773 100644
--- a/dev-ruby/rspec-rails/rspec-rails-2.99.0.ebuild
+++ b/dev-ruby/rspec-rails/rspec-rails-2.99.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
 
-USE_RUBY="ruby19 ruby20 ruby21"
+USE_RUBY="ruby20 ruby21"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec"
 
diff --git a/dev-ruby/rspec-rails/rspec-rails-3.3.3.ebuild b/dev-ruby/rspec-rails/rspec-rails-3.3.3.ebuild
index 04464e0d3be7..34f9b6d36421 100644
--- a/dev-ruby/rspec-rails/rspec-rails-3.3.3.ebuild
+++ b/dev-ruby/rspec-rails/rspec-rails-3.3.3.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
 
-USE_RUBY="ruby19 ruby20 ruby21"
+USE_RUBY="ruby20 ruby21"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/ruby-glib2/ruby-glib2-2.2.3-r1.ebuild b/dev-ruby/ruby-glib2/ruby-glib2-2.2.3-r1.ebuild
index 146023be0754..cd62941620b5 100644
--- a/dev-ruby/ruby-glib2/ruby-glib2-2.2.3-r1.ebuild
+++ b/dev-ruby/ruby-glib2/ruby-glib2-2.2.3-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22"
 
 inherit ruby-ng-gnome2
 
diff --git a/dev-ruby/ruby-glib2/ruby-glib2-2.2.3.ebuild b/dev-ruby/ruby-glib2/ruby-glib2-2.2.3.ebuild
index 024727faec69..c4bc25094eb4 100644
--- a/dev-ruby/ruby-glib2/ruby-glib2-2.2.3.ebuild
+++ b/dev-ruby/ruby-glib2/ruby-glib2-2.2.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
-USE_RUBY="ruby19 ruby20"
+USE_RUBY="ruby20"
 
 inherit ruby-ng-gnome2
 
diff --git a/dev-ruby/ruby-glib2/ruby-glib2-2.2.5.ebuild b/dev-ruby/ruby-glib2/ruby-glib2-2.2.5.ebuild
index fb0cc9f9f36c..75b409b606a3 100644
--- a/dev-ruby/ruby-glib2/ruby-glib2-2.2.5.ebuild
+++ b/dev-ruby/ruby-glib2/ruby-glib2-2.2.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22"
 
 inherit ruby-ng-gnome2
 
diff --git a/dev-ruby/sanitize/sanitize-2.0.6-r1.ebuild b/dev-ruby/sanitize/sanitize-2.0.6-r1.ebuild
index 468cded8e92a..cf56738a61fc 100644
--- a/dev-ruby/sanitize/sanitize-2.0.6-r1.ebuild
+++ b/dev-ruby/sanitize/sanitize-2.0.6-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
 
-USE_RUBY="ruby19 ruby20 ruby21"
+USE_RUBY="ruby20 ruby21"
 
 RUBY_FAKEGEM_RECIPE_TEST="rake"
 RUBY_FAKEGEM_RECIPE_DOC="none"
diff --git a/dev-ruby/sanitize/sanitize-2.1.0.ebuild b/dev-ruby/sanitize/sanitize-2.1.0.ebuild
index aacd07465de5..6fd829b90feb 100644
--- a/dev-ruby/sanitize/sanitize-2.1.0.ebuild
+++ b/dev-ruby/sanitize/sanitize-2.1.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
 
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22"
 
 RUBY_FAKEGEM_RECIPE_DOC="none"
 RUBY_FAKEGEM_EXTRADOC="HISTORY.md README.md"
diff --git a/dev-ruby/sanitize/sanitize-4.0.0-r1.ebuild b/dev-ruby/sanitize/sanitize-4.0.0-r1.ebuild
index e6e7db8f1e0f..e6e0f13f159f 100644
--- a/dev-ruby/sanitize/sanitize-4.0.0-r1.ebuild
+++ b/dev-ruby/sanitize/sanitize-4.0.0-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
 
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22"
 
 RUBY_FAKEGEM_RECIPE_DOC="none"
 RUBY_FAKEGEM_EXTRADOC="HISTORY.md README.md"
diff --git a/dev-ruby/sparklines/sparklines-0.5.2-r4.ebuild b/dev-ruby/sparklines/sparklines-0.5.2-r4.ebuild
index b11bbeb94e50..2a89d8e70c75 100644
--- a/dev-ruby/sparklines/sparklines-0.5.2-r4.ebuild
+++ b/dev-ruby/sparklines/sparklines-0.5.2-r4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
-USE_RUBY="ruby19 ruby20"
+USE_RUBY="ruby20"
 
 RUBY_FAKEGEM_TASK_DOC=""
 
diff --git a/dev-ruby/temple/temple-0.6.10.ebuild b/dev-ruby/temple/temple-0.6.10.ebuild
index 83003bd45ae6..e8b174fa5c54 100644
--- a/dev-ruby/temple/temple-0.6.10.ebuild
+++ b/dev-ruby/temple/temple-0.6.10.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_EXTRADOC="CHANGES EXPRESSIONS.md README.md"
diff --git a/dev-ruby/temple/temple-0.7.6.ebuild b/dev-ruby/temple/temple-0.7.6.ebuild
index b62083b16537..4447cbe57fb3 100644
--- a/dev-ruby/temple/temple-0.7.6.ebuild
+++ b/dev-ruby/temple/temple-0.7.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_EXTRADOC="CHANGES EXPRESSIONS.md README.md"
diff --git a/dev-ruby/term-ansicolor/term-ansicolor-1.2.2-r1.ebuild b/dev-ruby/term-ansicolor/term-ansicolor-1.2.2-r1.ebuild
index 75cd21c0618f..8dda2522651b 100644
--- a/dev-ruby/term-ansicolor/term-ansicolor-1.2.2-r1.ebuild
+++ b/dev-ruby/term-ansicolor/term-ansicolor-1.2.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
-USE_RUBY="ruby19 ruby20"
+USE_RUBY="ruby20"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_RECIPE_TEST="none"
diff --git a/dev-ruby/term-ansicolor/term-ansicolor-1.3.0.ebuild b/dev-ruby/term-ansicolor/term-ansicolor-1.3.0.ebuild
index afbfa9d2a4c9..3c202ef13e6c 100644
--- a/dev-ruby/term-ansicolor/term-ansicolor-1.3.0.ebuild
+++ b/dev-ruby/term-ansicolor/term-ansicolor-1.3.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_RECIPE_TEST="none"
diff --git a/dev-ruby/tins/tins-0.13.1.ebuild b/dev-ruby/tins/tins-0.13.1.ebuild
index 787f33b0f2da..456a7a920710 100644
--- a/dev-ruby/tins/tins-0.13.1.ebuild
+++ b/dev-ruby/tins/tins-0.13.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
-USE_RUBY="ruby19 ruby20"
+USE_RUBY="ruby20"
 
 RUBY_FAKEGEM_RECIPE_TEST="none"
 
diff --git a/dev-ruby/typhoeus/typhoeus-0.7.3.ebuild b/dev-ruby/typhoeus/typhoeus-0.7.3.ebuild
index 9f52ee7dc194..1d57c2924770 100644
--- a/dev-ruby/typhoeus/typhoeus-0.7.3.ebuild
+++ b/dev-ruby/typhoeus/typhoeus-0.7.3.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
 
-USE_RUBY="ruby19 ruby20 ruby21"
+USE_RUBY="ruby20 ruby21"
 
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md UPGRADE.md"
 RUBY_FAKEGEM_TASK_DOC=""
diff --git a/dev-ruby/typhoeus/typhoeus-0.8.0.ebuild b/dev-ruby/typhoeus/typhoeus-0.8.0.ebuild
index b7fac482ade7..112a41923a26 100644
--- a/dev-ruby/typhoeus/typhoeus-0.8.0.ebuild
+++ b/dev-ruby/typhoeus/typhoeus-0.8.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
 
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22"
 
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md UPGRADE.md"
 RUBY_FAKEGEM_TASK_DOC=""
diff --git a/dev-tex/latexdiff/Manifest b/dev-tex/latexdiff/Manifest
index 3a6d9e08eedb..4c4b7ba6c971 100644
--- a/dev-tex/latexdiff/Manifest
+++ b/dev-tex/latexdiff/Manifest
@@ -1,3 +1,4 @@
 DIST latexdiff-0.5.zip 310412 SHA256 7a99ac274c7552b1acf617d27866b40573469acafde0fb680231e58b2e08ddcf SHA512 fc0ff701f7c79842c0325923389a5118b626cfbea12ede0f98fc5e8311ac63fbc371fb5b1f4b4b50247112e16b0ac2fed8f5513d1c85dc1a69c97eb7f3a78351 WHIRLPOOL 06d0062c01b98f695bda8ee113faf247dae526451701aa91060a8cfacd7a7a13bd2d45235b641260fd2f2ebe9120364fe855c3d7959be45b10fcd7f03092987c
 DIST latexdiff-1.0.4.zip 445374 SHA256 42acfc6e379f61637d2d23f5dd940373cd1f0ef54858eaecb3f6dad250af2db1 SHA512 5ab3e00d94053f4d73e2a0ae47e7e98c2b53d1acd9411c2f2a5f438bc69cd13b1d3be19fe466d63f6fdcec3b132144ffe8409cdc8ff41a9fb0e408767f94ec61 WHIRLPOOL cda44d78a9ca53cb7b9668d31c31da61735f496120ba855fe8c83895907e396b30152ebf2076ec436a9a8454510c2db2229e75d913bba6ed9532e816d7d1221b
 DIST latexdiff-1.1.0.zip 466029 SHA256 9f0cc207d71a2225926cf9b8b87dbc4283c68de12db8a7708e780941516f13f6 SHA512 04af20386b0e611f73d981242747316da6376967fef611a29927b66a7a129bec49c7224655378c6f9fc744f8d69cf2ac977d0f50278d3686c98dcdc4aef0b675 WHIRLPOOL 944fe49aac3aaf8801a1e8c345551cf73ce5d205cd32c0ab5e6f1d1acafcaefb60f0d8a47488e6a7513139de89b7b78b7acc155cac4c328918dc33e79f12a7ed
+DIST latexdiff-1.1.1.zip 474456 SHA256 d530d268dd54458d728218e9ec7b4d9e9bc2858148bab64f277143e6a40fccee SHA512 a341411fdac11d2b8afef866b7edd0cbe5715f51dd77581202ec77f5a8a18a868f0e9e41058ecc38e0cf66cdddf893e2ffc58de3bf32509e01db6c77305dee77 WHIRLPOOL 90ca013144b8171861e769a33a0d857e2ad1240a8dfa8117ab3eb3dea284177015fa32c7a54fcf8ba61bcf8562b8c4503641c704a5fd04a74d73c4c5735708db
diff --git a/dev-tex/latexdiff/latexdiff-1.1.1.ebuild b/dev-tex/latexdiff/latexdiff-1.1.1.ebuild
new file mode 100644
index 000000000000..12b68233b2e2
--- /dev/null
+++ b/dev-tex/latexdiff/latexdiff-1.1.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="Compare two latex files and mark up significant differences"
+HOMEPAGE="http://www.ctan.org/tex-archive/support/latexdiff/ https://github.com/ftilmann/latexdiff/"
+SRC_URI="http://mirror.ctan.org/support/${PN}.zip -> ${P}.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+
+IUSE=""
+
+RDEPEND=">=dev-lang/perl-5.8
+	dev-perl/Algorithm-Diff"
+DEPEND="${RDEPEND}
+	app-arch/unzip"
+
+S=${WORKDIR}/${PN}
+
+src_test() {
+	emake test-ext
+}
+
+src_install() {
+	dobin latexdiff latexrevise latexdiff-vc
+	doman latexdiff.1 latexrevise.1 latexdiff-vc.1
+	dodoc README doc/latexdiff-man.pdf
+}
diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest
index 5a894bcb4392..e8cf5501063a 100644
--- a/dev-util/ccache/Manifest
+++ b/dev-util/ccache/Manifest
@@ -5,3 +5,4 @@ DIST ccache-3.2.1.tar.xz 297868 SHA256 872af34e1d2cef18694001d29db7f167d644e7602
 DIST ccache-3.2.2.tar.xz 300808 SHA256 4f0d99699f24d198494addca0f41a93b0150cdfd01491f15a5d7eb02c7c2a0ca SHA512 fc438f3b00baa41076eee3e5783ea53a208eb348343e587c6f729f7e98462cd20c720fe323fe08f271bc14dae48f7828cef769882f028f3772992989b87b075d WHIRLPOOL 095a125e869910644622b98b7720a01ccc235fbeb8c84ec52017fe52f82fe7b8122584c3e5fa4d39c1344e9c062517a1edb46c3e64fe649e845ed5c1fb455c5a
 DIST ccache-3.2.3.tar.xz 301728 SHA256 ec0414fc435982ece8b8fca062f5836ff32c5d5148abd7f80768614ed776600e SHA512 27da2032fd8936253e29f0410fc2f8085967de78ebe300bd1efecf78c67ed5e060e543df96bb29bc1bea75ec4d5e108f89d58dc6d9573bf6fcc8384d00b951dd WHIRLPOOL 721e9e8dab552c40bfd77df3225e33d49553b2bee5ec990dc6f33ce8bdd9009f4f35b75d08d04ce51ee36e0772a5b403c4d8629627dd6d488b717e23b3d3657c
 DIST ccache-3.2.4.tar.xz 302548 SHA256 1c3da93f654e78a4ac71a54b0f63b19bc0fef9aa5522f4ebb9c201d4361cea5d SHA512 d048b70804c81dece97f3ba511b3c109ec0d14e7dca69bc68faeeb61a4a7b5639c03e3e5ad7dad4e42b4bd198d7a7fffa4e3b7ef99590dfd4df0805db6c25db7 WHIRLPOOL 3dc1de9d1cab8769b3776e48746a1967536e7a9d01e4eb23e1ddbaaf2858c16eba170a185312bfdb0a58951c77cd6c79ff30c7cf6ab366ade64c2b6997df7703
+DIST ccache-3.2.5.tar.xz 304592 SHA256 117011534b199dbe290b08acae1591c81525536a1e140da22e0fbc04c20bab85 SHA512 12612b899044db50c60bea8ed6cfeb54960ab67514d0aabaea5ee71d3d4d83bb00637e02008365d1d061adf5aa546499948a5eb8a0419222f681058c7fd5fd24 WHIRLPOOL 2cad966b419c16d7956fb2644c1113a8817437f313d54dd17fb16ae4a15f67a322b59d1b225307c980d2e17442478b71ef2bb118d2af4025e530e68fb46767cb
diff --git a/dev-util/ccache/ccache-3.2.5.ebuild b/dev-util/ccache/ccache-3.2.5.ebuild
new file mode 100644
index 000000000000..b2a931e2bc12
--- /dev/null
+++ b/dev-util/ccache/ccache-3.2.5.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils readme.gentoo-r1
+
+DESCRIPTION="fast compiler cache"
+HOMEPAGE="http://ccache.samba.org/"
+SRC_URI="http://samba.org/ftp/ccache/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND="app-arch/xz-utils
+	sys-libs/zlib"
+RDEPEND="${DEPEND}
+	sys-apps/gentoo-functions"
+
+src_prepare() {
+	# make sure we always use system zlib
+	rm -rf zlib || die
+	epatch "${FILESDIR}"/${PN}-3.1.10-size-on-disk.patch #456178
+	sed \
+		-e "/^EPREFIX=/s:'':'${EPREFIX}':" \
+		"${FILESDIR}"/ccache-config-3 > ccache-config || die
+}
+
+src_install() {
+	DOCS=( AUTHORS.txt MANUAL.txt NEWS.txt README.txt )
+	default
+
+	dobin ccache-config
+
+	DOC_CONTENTS="
+To use ccache with **non-Portage** C compiling, add
+${EPREFIX}/usr/lib/ccache/bin to the beginning of your path, before ${EPREFIX}/usr/bin.
+Portage 2.0.46-r11+ will automatically take advantage of ccache with
+no additional steps.  If this is your first install of ccache, type
+something like this to set a maximum cache size of 2GB:\\n
+# ccache -M 2G\\n
+If you are upgrading from an older version than 3.x you should clear all of your caches like so:\\n
+# CCACHE_DIR='${CCACHE_DIR:-${PORTAGE_TMPDIR}/ccache}' ccache -C\\n
+ccache now supports sys-devel/clang and dev-lang/icc, too!"
+
+	readme.gentoo_create_doc
+}
+
+pkg_prerm() {
+	if [[ -z ${REPLACED_BY_VERSION} ]] ; then
+		"${EROOT}"/usr/bin/ccache-config --remove-links
+		"${EROOT}"/usr/bin/ccache-config --remove-links ${CHOST}
+	fi
+}
+
+pkg_postinst() {
+	"${EROOT}"/usr/bin/ccache-config --install-links
+	"${EROOT}"/usr/bin/ccache-config --install-links ${CHOST}
+
+	# nuke broken symlinks from previous versions that shouldn't exist
+	rm -f "${EROOT}"/usr/lib/ccache/bin/${CHOST}-cc || die
+	rm -rf "${EROOT}"/usr/lib/ccache.backup || die
+
+	readme.gentoo_print_elog
+}
diff --git a/dev-vcs/blogc-git-receiver/Manifest b/dev-vcs/blogc-git-receiver/Manifest
index 7afd620e3c44..ae7a030d50c9 100644
--- a/dev-vcs/blogc-git-receiver/Manifest
+++ b/dev-vcs/blogc-git-receiver/Manifest
@@ -1 +1 @@
-DIST blogc-git-receiver-0.3.1.tar.xz 248740 SHA256 684b295f00ac1a5e88db01fdae3197795e7636d82cfd7aa3b2632c7c7254db87 SHA512 63c6fa417c39d1e4da197a519d3cfc20b29a47f6c0f3e75f6bd796416aca7570fa293a3c3eb7e1c2949a3746d1caa84021296e2fe32e6ccbde9553ff56346c25 WHIRLPOOL 887fe34e721ad9ac9afb5824d85619f737798e2ab3f5a8c1fcee04ed5a3f099777b90164d55055b70ce6c1283ac672349c7a30730590e65f1e1851f6af9ba917
+DIST blogc-git-receiver-0.4.0.tar.xz 240764 SHA256 14d3b60e2568c0995cc1cc4cb656a45aa63a44841f1246b441bb1011c5269d93 SHA512 d1c7cb660d570c66ae25046dfc1ea68ff0f9a76432b0063e7f3a955d5d8564fdb2443791191f94534f94a797e8f46e421554f009ca43ba5fd8f377eabecd57ea WHIRLPOOL 61f92b5280162e270c660e127a104a09a9e136b707333f605783308274978f28542b27a38c009b36d0411bedbf612a4ba8decef0eabc5550b69845fa121bdae4
diff --git a/dev-vcs/blogc-git-receiver/blogc-git-receiver-0.3.1.ebuild b/dev-vcs/blogc-git-receiver/blogc-git-receiver-0.4.0.ebuild
similarity index 90%
rename from dev-vcs/blogc-git-receiver/blogc-git-receiver-0.3.1.ebuild
rename to dev-vcs/blogc-git-receiver/blogc-git-receiver-0.4.0.ebuild
index 8c73a5c9a234..5a2c6ffbd0af 100644
--- a/dev-vcs/blogc-git-receiver/blogc-git-receiver-0.3.1.ebuild
+++ b/dev-vcs/blogc-git-receiver/blogc-git-receiver-0.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -20,7 +20,7 @@ if [[ ${PV} = *9999* ]]; then
 	KEYWORDS=""
 	DEPEND="=dev-libs/squareball-9999"
 else
-	DEPEND=">=dev-libs/squareball-0.1"
+	DEPEND=">=dev-libs/squareball-0.2.0"
 fi
 
 LICENSE="BSD"
diff --git a/dev-vcs/blogc-git-receiver/blogc-git-receiver-9999.ebuild b/dev-vcs/blogc-git-receiver/blogc-git-receiver-9999.ebuild
index 8c73a5c9a234..5a2c6ffbd0af 100644
--- a/dev-vcs/blogc-git-receiver/blogc-git-receiver-9999.ebuild
+++ b/dev-vcs/blogc-git-receiver/blogc-git-receiver-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -20,7 +20,7 @@ if [[ ${PV} = *9999* ]]; then
 	KEYWORDS=""
 	DEPEND="=dev-libs/squareball-9999"
 else
-	DEPEND=">=dev-libs/squareball-0.1"
+	DEPEND=">=dev-libs/squareball-0.2.0"
 fi
 
 LICENSE="BSD"
diff --git a/eclass/ssl-cert.eclass b/eclass/ssl-cert.eclass
index 002de767fa09..0db29863bc5b 100644
--- a/eclass/ssl-cert.eclass
+++ b/eclass/ssl-cert.eclass
@@ -30,10 +30,10 @@
 
 if [[ "${SSL_DEPS_SKIP}" == "0" ]]; then
 	if [[ "${SSL_CERT_MANDATORY}" == "0" ]]; then
-		DEPEND="${SSL_CERT_USE}? ( dev-libs/openssl:0= )"
+		DEPEND="${SSL_CERT_USE}? ( dev-libs/openssl:0 )"
 		IUSE="${SSL_CERT_USE}"
 	else
-		DEPEND="dev-libs/openssl:0="
+		DEPEND="dev-libs/openssl:0"
 	fi
 fi
 
diff --git a/games-fps/quake2-demodata/quake2-demodata-3.14.ebuild b/games-fps/quake2-demodata/quake2-demodata-3.14.ebuild
index 132919c3efc8..7c16869fa516 100644
--- a/games-fps/quake2-demodata/quake2-demodata-3.14.ebuild
+++ b/games-fps/quake2-demodata/quake2-demodata-3.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI=5
@@ -19,40 +19,12 @@ KEYWORDS="~alpha ~amd64 ~ia64 ppc sparc x86 ~x86-fbsd"
 IUSE="symlink"
 
 RDEPEND=""
-DEPEND="app-arch/unzip"
+DEPEND="app-arch/unzip
+	!games-fps/quake2-data" # games-fps/quake2-data already includes the demo data
 
 S=${WORKDIR}
 dir=${GAMES_DATADIR}/${MY_PN}
 
-pkg_setup() {
-	games_pkg_setup
-
-	local alert_user
-
-	if ! use symlink ; then
-		ewarn "The 'symlink' USE flag is needed for Quake 2 clients"
-		ewarn "to easily play the demo data."
-		echo
-		alert_user=y
-	fi
-
-	if has_version "games-fps/quake2-data" ; then
-		ewarn "games-fps/quake2-data already includes the demo data,"
-		ewarn "so this installation is not very useful."
-		echo
-		if use symlink ; then
-			eerror "The symlink for the demo data conflicts with the cdinstall data"
-			die "Remove the 'symlink' USE flag for this package"
-		fi
-		alert_user=y
-	fi
-
-	if [[ -n "${alert_user}" ]] ; then
-		ebeep
-		epause
-	fi
-}
-
 src_unpack() {
 	unpack_zip ${A}
 }
diff --git a/games-fps/qudos/Manifest b/games-fps/qudos/Manifest
index 4c5257af06dc..b7fc28b47dcd 100644
--- a/games-fps/qudos/Manifest
+++ b/games-fps/qudos/Manifest
@@ -1,2 +1,2 @@
 DIST QuDos-0.40.1-src.tar.bz2 2031636 SHA256 90d8dbbbe4e006b4233b9c8c20bc3da5c240dde8fdf17ccf43ca533d296aa21a SHA512 97b9c6bac0d09c060ab33174604deb2781f0ebdc48b00bd0bc402523fb04cdf84edd8abc18507bba8c7e616f6d460a1de6debc96ec39bb5562b20a7f06eea734 WHIRLPOOL 623456b47dfefc389ceadf267369221c2a89a934597fbc5e951c9728d6947a982525884803cfae6a59ede682c637bfba2f97f0c3e2c98579fce63dfe71161fca
-DIST QuDos-0.40.1.pk3 5253128 SHA256 c02e0df50785d5b360ec5435e2fd3d31b337f28f676b7af141a8e2664f518f1c SHA512 69d1e752c32e763f0452f41856fbb9833676dfd27337633c65666b47be13db48be7ad6f81054b180a3fdc43d3952f3bbe632df12fa0a8e86be14c48c2d8daec5 WHIRLPOOL 33d54cadce0d5d3fd4353838dcd9719443f3fc01f5bb859f80aae105389990c62cc8ee5576eb81098ccce5320d7591b9c955f9e82c61461ec217e01034a939d4
+DIST QuDos-0.40.1.pk3 4210489 SHA256 c6f4dec4b0499b7b9d311d0d2a438358a205d4203eeee1b49f5695e5e14859ca SHA512 19c3c6b3d17cbd9642320d8eb7a83d667afeafd0ee5eb818e9f07be71e2ab69182474c1f529ecbcfcfa59590bafedb0de3c70dfff10e4bc7a6e07a1546f27d4b WHIRLPOOL 53d571d352f2f184fad9fcefd45a77e4d703e3338b5ec4baa77d0f46fb669d95164a2fa33dd80cb7083c40dd86da54cf4a0bea6e5d5dbb9253c3c9b53a44f86c
diff --git a/games-fps/qudos/qudos-0.40.1.ebuild b/games-fps/qudos/qudos-0.40.1.ebuild
index 32e875905a41..d59f1662de5f 100644
--- a/games-fps/qudos/qudos-0.40.1.ebuild
+++ b/games-fps/qudos/qudos-0.40.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -10,20 +10,21 @@ PK3_FILE="QuDos-${PV}.pk3"
 MY_PN="quake2"
 
 DESCRIPTION="Enhanced Quake 2 engine"
-HOMEPAGE="http://qudos.quakedev.com/"
-SRC_URI="http://qudos.quakedev.com/linux/${MY_PN}/engines/QuDos/${FILE_STEM}.tar.bz2
-	http://qudos.quakedev.com/linux/${MY_PN}/engines/QuDos/${PK3_FILE}"
+HOMEPAGE="https://github.com/ZwS/qudos"
+SRC_URI="mirror://gentoo/${FILE_STEM}.tar.bz2
+	https://github.com/ZwS/qudos/raw/master/quake2/baseq2/qudos.pk3 -> ${PK3_FILE}"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="alsa cdinstall debug dedicated demo dga ipv6 joystick mods opengl qmax oss sdl textures"
+IUSE="cdinstall debug dedicated demo dga ipv6 joystick mods opengl qmax oss sdl textures"
 
-UIDEPEND="alsa? ( media-libs/alsa-lib )
-	opengl? (
+DEPEND="opengl? (
+		virtual/opengl
+		virtual/glu )
+	sdl? ( media-libs/libsdl[joystick?,opengl,sound,video]
 		virtual/opengl
 		virtual/glu )
-	sdl? ( media-libs/libsdl )
 	virtual/jpeg:0
 	media-libs/libogg
 	media-libs/libpng:0
@@ -33,11 +34,10 @@ UIDEPEND="alsa? ( media-libs/alsa-lib )
 	x11-libs/libXext
 	x11-libs/libXxf86dga
 	x11-libs/libXxf86vm"
-RDEPEND="${UIDEPEND}
+RDEPEND="${DEPEND}
 	cdinstall? ( games-fps/quake2-data )
-	demo? ( games-fps/quake2-demodata )
+	demo? ( games-fps/quake2-demodata[symlink] )
 	textures? ( games-fps/quake2-textures )"
-DEPEND="${UIDEPEND}"
 
 S=${WORKDIR}/${FILE_STEM}
 dir=${GAMES_DATADIR}/${MY_PN}
@@ -71,19 +71,12 @@ pkg_setup() {
 	snd_drv=""
 	[[ -z "${snd_drv}" ]] && use oss && snd_drv="oss"
 	[[ -z "${snd_drv}" ]] && use sdl && snd_drv="sdl"
-	[[ -z "${snd_drv}" ]] && use alsa && snd_drv="alsa"
 	# Default if nothing else chosen
 	[[ -z "${snd_drv}" ]] && snd_drv="oss"
 
 	if default_client ; then
 		elog "Selected the ${snd_drv} sound driver as the default."
 		echo
-		if [[ "${snd_drv}" = "alsa" ]] ; then
-			ewarn "The ALSA sound driver for this game is incomplete."
-			# OSS is the default sound driver in the Makefile
-			ewarn "The 'oss' USE flag is recommended instead."
-			echo
-		fi
 	fi
 }
 
@@ -95,17 +88,21 @@ src_prepare() {
 	rm docs/gnu.txt
 
 	# Change default sound driver and its location
-	sed -i src/client/snd_dma.c \
+	sed -i \
 		-e "s:\"oss\":\"${snd_drv}\":" \
 		-e "s:\"\./snd:\"$(games_get_libdir)/${PN}/snd:" \
-		|| die "sed snd_dma.c failed"
+		src/client/snd_dma.c || die
 
 	sed -i \
 		-e 's:jpeg_mem_src:qudos_jpeg_mem_src:g' \
 		src/ref_gl/gl_image.c || die
 
-	has_version '>=sys-libs/zlib-1.2.5.1-r1' && \
-		sed -i -e '1i#define OF(x) x' src/qcommon/unzip/ioapi.h
+	if has_version '>=sys-libs/zlib-1.2.5.1-r1' ; then
+		sed -i \
+			-e '1i#define OF(x) x' \
+			src/qcommon/unzip/ioapi.h || die
+	fi
+	sed -i -e '106,119 s/CFL/LED/' Makefile || die
 
 	epatch \
 		"${FILESDIR}"/${P}-libpng15.patch \
@@ -113,7 +110,7 @@ src_prepare() {
 }
 
 src_compile() {
-	yesno() { use $1 && echo YES || echo NO ; }
+	yesno() { usex $1 YES NO; }
 
 	local client="YES"
 	default_client || client="NO"
@@ -121,12 +118,12 @@ src_compile() {
 	local type="release"
 	use debug && type="debug"
 
-	emake -j1 \
+	emake \
 		BUILD_QUAKE2="${client}" \
 		BUILD_DEDICATED=$(yesno dedicated) \
 		BUILD_GLX=$(yesno opengl) \
 		BUILD_SDLGL=$(yesno sdl) \
-		BUILD_ALSA_SND=$(yesno alsa) \
+		BUILD_ALSA_SND=NO \
 		BUILD_SDL_SND=$(yesno sdl) \
 		BUILD_OSS_SND=$(yesno oss) \
 		WITH_XMMS=NO \
@@ -176,13 +173,3 @@ src_install() {
 
 	prepgamesdirs
 }
-
-pkg_postinst() {
-	games_pkg_postinst
-
-	if use demo && ! has_version "games-fps/quake2-demodata[symlink]" ; then
-		ewarn "To play the Quake 2 demo,"
-		ewarn "emerge games-fps/quake2-demodata with the 'symlink' USE flag."
-		echo
-	fi
-}
diff --git a/gnome-base/gdm/Manifest b/gnome-base/gdm/Manifest
index 0a6ebffcb6b1..3b5f9798f204 100644
--- a/gnome-base/gdm/Manifest
+++ b/gnome-base/gdm/Manifest
@@ -1,3 +1,3 @@
-DIST gdm-3.16.4.tar.xz 1535580 SHA256 281dd28d729eaab2f67e450b5b162299dec537b6f7e81fa1124e35c89d3942fd SHA512 31cc33e32452ae817b60528308ced6120060781f19d695a501e1f9eea2ed0c883d1503f288919d659e5764e87163c3e334878b19c01c8909baf098c69db05b6c WHIRLPOOL c64144c1030933b037e28872f93f6a6c9bca64571090912f4b8b13229a61830dd2aa36ca997f9fa759793337ba741362ddf0f254a435e7ffd03a93bc726d9386
 DIST gdm-3.18.2.tar.xz 1574772 SHA256 549235247611d74f0d5d5a4aa01ba9350a4d3468e44ac013b40791c6a986f822 SHA512 db2213db81b0505387a3fc4a9d4c6dd3fb1a8f167fcd7b228a695142b5d2f8125603971a78b5e40f06f19b79af21f4b5a77a5e78162e56f4a95001fb3bd6c035 WHIRLPOOL 00dca354a7a470ff81dc1adff40b08764b03108630e5b24fab2343725699e6b99527ff7308025008ed9b5ac060b5b77935871c0c9620513bb0317f4280e25c43
+DIST gdm-3.18.3.tar.xz 1605980 SHA256 068729fa1744b38eb96be5440416e420c6e41783e9e53d0a217c89928581b1a3 SHA512 b1d80a37f8ae7fe924d7539c1d10e15ce5fb25ad00e6ca8ae1e8df5b901a4a7327b126e869eb56b76a6247709fed193eecd636b74643f61e296d371ae7468e98 WHIRLPOOL 6e9e44796787663b75547821972b3e2cfdcf5b0711bafa412ca1c2961ff00de868b5bf664ab949b7e4736ef86e1bbfdce7f6212edda1017ae48114b90d8de40f
 DIST tango-gentoo-v1.1.tar.gz 29322 SHA256 518efa4257c8e689488399db23397a89f4dcd5990ce537ef6215860ad5606eb0 SHA512 87d47ddab68361db6d99866c51705dcb3e198f8345a1096859acf2c6cca5099dd23c7fb30d124f52c4933ea38fd45fadffbbe6ecbdfa84f5b60938a4824f9045 WHIRLPOOL 9e1635a505ea48f4fe8bdb3b8b3b43cfb9cf99e3204194c51361b198886e719921cfacbc15f9f6407aa7d0c4af178e24c74b998fc370fa2329040e5be1baf153
diff --git a/gnome-base/gdm/gdm-3.16.4.ebuild b/gnome-base/gdm/gdm-3.18.3.ebuild
similarity index 87%
rename from gnome-base/gdm/gdm-3.16.4.ebuild
rename to gnome-base/gdm/gdm-3.18.3.ebuild
index 08f99a4e772e..eba3c7659649 100644
--- a/gnome-base/gdm/gdm-3.16.4.ebuild
+++ b/gnome-base/gdm/gdm-3.18.3.ebuild
@@ -6,7 +6,7 @@ EAPI="5"
 GCONF_DEBUG="yes"
 GNOME2_LA_PUNT="yes"
 
-inherit autotools eutils gnome2 pam readme.gentoo systemd user versionator
+inherit autotools eutils gnome2 pam readme.gentoo-r1 systemd user versionator
 
 DESCRIPTION="GNOME Display Manager for managing graphical display servers and user logins"
 HOMEPAGE="https://wiki.gnome.org/Projects/GDM"
@@ -22,10 +22,9 @@ LICENSE="
 
 SLOT="0"
 
-IUSE="accessibility audit branding fprint +introspection ipv6 plymouth selinux smartcard +systemd tcpd test wayland xinerama"
-REQUIRED_USE="wayland? ( systemd )"
+IUSE="accessibility audit branding fprint +introspection ipv6 plymouth selinux smartcard tcpd test wayland xinerama"
 
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
 
 # NOTE: x11-base/xorg-server dep is for X_SERVER_PATH etc, bug #295686
 # nspr used by smartcard extension
@@ -38,7 +37,7 @@ COMMON_DEPEND="
 	>=gnome-base/dconf-0.20
 	>=gnome-base/gnome-settings-daemon-3.1.4
 	gnome-base/gsettings-desktop-schemas
-	>=media-libs/fontconfig-2.5.0
+	>=media-libs/fontconfig-2.5.0:1.0
 	>=media-libs/libcanberra-0.4[gtk3]
 	sys-apps/dbus
 	>=sys-apps/accountsservice-0.6.12
@@ -54,13 +53,10 @@ COMMON_DEPEND="
 	>=x11-misc/xdg-utils-1.0.2-r3
 
 	virtual/pam
-	systemd? ( >=sys-apps/systemd-186:0=[pam] )
-	!systemd? (
-		>=x11-base/xorg-server-1.14.3-r1
-		>=sys-auth/consolekit-0.4.5_p20120320-r2
-		!<sys-apps/openrc-0.12
-	)
-	sys-auth/pambase[systemd?]
+
+	>=sys-apps/systemd-186:0=[pam]
+
+	sys-auth/pambase[systemd]
 
 	audit? ( sys-process/audit )
 	introspection? ( >=dev-libs/gobject-introspection-0.9.12:= )
@@ -75,9 +71,7 @@ COMMON_DEPEND="
 RDEPEND="${COMMON_DEPEND}
 	>=gnome-base/gnome-session-3.6
 	>=gnome-base/gnome-shell-3.1.90
-	gnome-extra/polkit-gnome:0
 	x11-apps/xhost
-	x11-themes/gnome-icon-theme-symbolic
 
 	accessibility? (
 		>=app-accessibility/orca-3.10
@@ -130,9 +124,6 @@ pkg_setup() {
 }
 
 src_prepare() {
-	# make custom session work, bug #216984, upstream bug #737578
-	epatch "${FILESDIR}/${PN}-3.2.1.1-custom-session.patch"
-
 	# ssh-agent handling must be done at xinitrc.d, bug #220603
 	epatch "${FILESDIR}/${PN}-2.32.0-xinitrc-ssh-agent.patch"
 
@@ -159,6 +150,7 @@ src_configure() {
 	! use plymouth && myconf="${myconf} --with-initial-vt=7"
 
 	gnome2_src_configure \
+		--enable-gdm-xsession \
 		--with-run-dir=/run/gdm \
 		--localstatedir="${EPREFIX}"/var \
 		--disable-static \
@@ -166,15 +158,12 @@ src_configure() {
 		--enable-authentication-scheme=pam \
 		--with-default-pam-config=exherbo \
 		--with-at-spi-registryd-directory="${EPREFIX}"/usr/libexec \
-		--with-consolekit-directory="${EPREFIX}"/usr/lib/ConsoleKit \
 		--without-xevie \
+		--enable-systemd-journal \
 		$(use_with audit libaudit) \
 		$(use_enable ipv6) \
 		$(use_with plymouth) \
 		$(use_with selinux) \
-		$(use_with systemd) \
-		$(use_with !systemd console-kit) \
-		$(use_enable systemd systemd-journal) \
 		$(systemd_with_unitdir) \
 		$(use_with tcpd tcp-wrappers) \
 		$(use_enable wayland wayland-support) \
diff --git a/kde-misc/plasma-applet-redshift-control/metadata.xml b/kde-misc/plasma-applet-redshift-control/metadata.xml
index 2fdbf33d963d..519e1b154ca8 100644
--- a/kde-misc/plasma-applet-redshift-control/metadata.xml
+++ b/kde-misc/plasma-applet-redshift-control/metadata.xml
@@ -5,4 +5,7 @@
 		<email>kde@gentoo.org</email>
 		<name>Gentoo KDE Project</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">kotelnik/plasma-applet-redshift-control</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-gfx/gthumb/Manifest b/media-gfx/gthumb/Manifest
index 33d76271c701..ddd7115c769d 100644
--- a/media-gfx/gthumb/Manifest
+++ b/media-gfx/gthumb/Manifest
@@ -1,2 +1,3 @@
 DIST gthumb-3.4.1.tar.xz 3407712 SHA256 1ec2cf49f499ed06eda851a3bd5c28a1768839a6ff06bc4efc5fbde46cabc857 SHA512 3aeb2b107f7d9636713a8b532e0a652bb88349ad3699c4677e51a813500e974996d9ab0e1c10ee27219d021e5e35a9c70bbabb74fe69ec015e2c6a897e3571ca WHIRLPOOL 3d9a60164774a15c99752b57746815f4648b0f938d3127b21d61c652754ff5c73d598cb8c7d9b0e70c1e84fc12a3f4485a4eb23f3099c549be45cd65d1686667
 DIST gthumb-3.4.2.tar.xz 3416352 SHA256 c34423bf9a33bc287e8e81a917fe29d1956e5308a7191e86f486f66c71607cfa SHA512 7cf860b6c3b213d6d64b7f174c911407db7dbf43008cce59dedfb4671dac739bbfb464baec4fbaa7443c5eb3294c5d1b63b74ca142272cf7d55e9997118a9511 WHIRLPOOL 080417eacd7dc8489d22e65343e793d2c61b9e90795b57e84238e716a3cc35c27087f90e2c7a35bce1fcc78306b0a4337fb4e17245ec5bc112a7d321af26c414
+DIST gthumb-3.4.3.tar.xz 3418088 SHA256 c10fd12f3bfea31c390c74e8e08f86f16e2159fbd6c806daa025423e0ded825d SHA512 c911bec86aa859e2394b961f1317e4deecbb923adcca93243d74801238065a50cf981e9bc4f73ba7a32e770e0e57c013078c50193033b1c2512127ba2c1ef2af WHIRLPOOL f21a8451bb733367382e9202cd97bdb1be677d95886683c5c8a3ce0ecac68eca1bfe274d03485ee4b7bdd50ff2781cb2408cdaf12e2bfc3f06fd25d0976acf33
diff --git a/media-gfx/gthumb/gthumb-3.4.3.ebuild b/media-gfx/gthumb/gthumb-3.4.3.ebuild
new file mode 100644
index 000000000000..ead252ef0e15
--- /dev/null
+++ b/media-gfx/gthumb/gthumb-3.4.3.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2
+
+DESCRIPTION="Image viewer and browser for Gnome"
+HOMEPAGE="https://wiki.gnome.org/Apps/gthumb"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="cdr exif gnome-keyring gstreamer http jpeg json lcms raw slideshow svg tiff test webkit webp"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.36.0:2[dbus]
+	>=x11-libs/gtk+-3.10.0:3
+
+	media-libs/libpng:0=
+	sys-libs/zlib
+	x11-libs/libICE
+	x11-libs/libSM
+
+	cdr? ( >=app-cdr/brasero-3.2 )
+	exif? ( >=media-gfx/exiv2-0.21:= )
+	gnome-keyring? ( >=app-crypt/libsecret-0.11 )
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0 )
+	http? ( >=net-libs/libsoup-2.42.0:2.4 )
+	jpeg? ( virtual/jpeg:0= )
+	json? ( >=dev-libs/json-glib-0.15.0 )
+	lcms? ( >=media-libs/lcms-2.6:2 )
+	slideshow? (
+		>=media-libs/clutter-1.12.0:1.0
+		>=media-libs/clutter-gtk-1:1.0 )
+	svg? ( >=gnome-base/librsvg-2.34 )
+	tiff? ( media-libs/tiff:= )
+	raw? ( >=media-libs/libraw-0.14:= )
+	!raw? ( media-gfx/dcraw )
+	webkit? ( net-libs/webkit-gtk:4 )
+	webp? ( >=media-libs/libwebp-0.2.0 )
+"
+RDEPEND="${COMMON_DEPEND}
+	>=gnome-base/gsettings-desktop-schemas-0.1.4
+"
+DEPEND="${COMMON_DEPEND}
+	app-text/yelp-tools
+	>=dev-util/intltool-0.35
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+	test? ( ~app-text/docbook-xml-dtd-4.1.2 )
+"
+# eautoreconf needs:
+#	gnome-base/gnome-common
+
+src_prepare() {
+	# Remove unwanted CFLAGS added with USE=debug
+	sed -e 's/CFLAGS="$CFLAGS -g -O0 -DDEBUG"//' \
+		-i configure.ac -i configure || die
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Upstream says in configure help that libchamplain support
+	# crashes frequently
+	gnome2_src_configure \
+		--disable-static \
+		--disable-libchamplain \
+		$(use_enable cdr libbrasero) \
+		$(use_enable exif exiv2) \
+		$(use_enable gnome-keyring libsecret) \
+		$(use_enable gstreamer) \
+		$(use_enable http libsoup) \
+		$(use_enable jpeg) \
+		$(use_enable json libjson-glib) \
+		$(use_enable lcms lcms2) \
+		$(use_enable raw libraw) \
+		$(use_enable slideshow clutter) \
+		$(use_enable svg librsvg) \
+		$(use_enable test test-suite) \
+		$(use_enable tiff) \
+		$(use_enable webkit webkit2) \
+		$(use_enable webp libwebp)
+}
diff --git a/media-sound/clementine/Manifest b/media-sound/clementine/Manifest
index 9a18ea585dee..da3271b8ae0f 100644
--- a/media-sound/clementine/Manifest
+++ b/media-sound/clementine/Manifest
@@ -1,3 +1,3 @@
 DIST clementine-1.2.2.tar.gz 9076752 SHA256 1f674c42f05c476baf74f1dd37b1aa357ff9199e4493173052c856a53e5f0a96 SHA512 48e934ed1f18724c4cc79eaf7ac16dcb2ecc9d268a4986a8a421c6518d7a13bd81a5b7d249b4ff146c860bed520a59d2062139fb57672609019b8c2c84e495ca WHIRLPOOL 13c3f129566c0789e67b23b2382d7ed1f756221647c4b2cc1b4b1b1efcb5e04571837a843c8ff7c099f9bcd3f9b1dd481b1fa75fe1c4b27e90169026e8880840
 DIST clementine-1.2.3.tar.gz 9076977 SHA256 7df5650445a005c09f5f0e1a1b0d077037c37ecbe4ee77baf9d45f121308a1bf SHA512 fd43a7dcfec360d4478a56d0600300b6913b294f127afb0249971b45b54b48475d128861e06885c482bbdd37b09aa56b1c238675763fdb8c50329005b066bec3 WHIRLPOOL 23d0fb971118b0d73ec4a52cfa3f8829118ab65c12fb01ce30433541f5da081b52c5dd485aa0efdda2b4b57b286f59702aa686f9b7ce17a0a2595b208b95d524
-DIST clementine-1.3_rc1.tar.gz 8477665 SHA256 f08b797b47305b8a0b7e1713d11977df12e09911f05c577c9f81641369f252a0 SHA512 973410a0d2baf0646a77eb5bcbea2af3f34a4baa5671f7a81fa99203703c478d38dd2f32ce0ccac9babf8add56717fd5fdec8a4bacefe8b9b8fa0256ec509edb WHIRLPOOL 968ca43b4a15169926ad68a009c568ae03ef17e8b0542fe6c4ebd07fc4e64ae6782ab63d3a05851064e288522e44e885a9a1dc52b94246e016c60c91e41e0a76
+DIST clementine-1.3.tar.gz 8500723 SHA256 55e8d283ed02e3f2376a88b012cd2003e00fef95a98b6a919d67cb57e96b8617 SHA512 eccebb8a4d7e4abf39af7b75f40d38d184650932d2c40859cdfb3cfda24d2a35fea8518b03d9fb24f21c4dae6f11baffe2b00fe6989ec14fed99a4ccbb85ca54 WHIRLPOOL cbd6922fa586cce6be29ef0fd6151d6d89ce95aa6e237cf2716e7493ba6be2026d11a44012dc84be2e033c606c79c3e9e0338cbbd5927d7f16f358718c016895
diff --git a/media-sound/clementine/clementine-1.3_rc1.ebuild b/media-sound/clementine/clementine-1.3.ebuild
similarity index 98%
rename from media-sound/clementine/clementine-1.3_rc1.ebuild
rename to media-sound/clementine/clementine-1.3.ebuild
index 79b9c7d77379..bfac234d663d 100644
--- a/media-sound/clementine/clementine-1.3_rc1.ebuild
+++ b/media-sound/clementine/clementine-1.3.ebuild
@@ -56,6 +56,7 @@ COMMON_DEPEND="
 	mtp? ( >=media-libs/libmtp-1.0.0 )
 	moodbar? ( sci-libs/fftw:3.0 )
 	projectm? ( media-libs/glew:= )
+	>=dev-libs/crypto++-5.6.2-r4
 "
 # now only presets are used, libprojectm is internal
 # https://github.com/clementine-player/Clementine/tree/master/3rdparty/libprojectm/patches
@@ -92,9 +93,7 @@ MY_P="${P/_}"
 [[ ${PV} == *9999* ]] || \
 S="${WORKDIR}/C${MY_P:1}"
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.3_rc1-cmake.patch
-)
+PATCHES=( "${FILESDIR}"/${PN}-1.3-fix-tokenizer.patch )
 
 src_prepare() {
 	cmake-utils_src_prepare
diff --git a/media-sound/clementine/clementine-1.3_rc1-r1.ebuild b/media-sound/clementine/clementine-1.3_rc1-r1.ebuild
deleted file mode 100644
index debdf11b3bf8..000000000000
--- a/media-sound/clementine/clementine-1.3_rc1-r1.ebuild
+++ /dev/null
@@ -1,168 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-EGIT_REPO_URI="https://github.com/clementine-player/Clementine.git"
-
-LANGS=" af ar be bg bn br bs ca cs cy da de el en_CA en_GB eo es et eu fa fi fr ga gl he he_IL hi hr hu hy ia id is it ja ka kk ko lt lv mr ms my nb nl oc pa pl pt pt_BR ro ru si_LK sk sl sr sr@latin sv te tr tr_TR uk uz vi zh_CN zh_TW"
-
-inherit cmake-utils flag-o-matic fdo-mime gnome2-utils virtualx
-[[ ${PV} == *9999* ]] && inherit git-2
-
-DESCRIPTION="A modern music player and library organizer based on Amarok 1.4 and Qt4"
-HOMEPAGE="http://www.clementine-player.org https://github.com/clementine-player/Clementine"
-[[ ${PV} == *9999* ]] || \
-SRC_URI="https://github.com/clementine-player/Clementine/archive/${PV/_}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-[[ ${PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~x86"
-IUSE="box cdda +dbus debug dropbox googledrive ipod lastfm mms moodbar mtp projectm skydrive test ubuntu-one +udisks wiimote"
-IUSE+="${LANGS// / linguas_}"
-
-REQUIRED_USE="
-	udisks? ( dbus )
-	wiimote? ( dbus )
-"
-
-# qca dep is temporary for bug #489850
-COMMON_DEPEND="
-	dev-db/sqlite:=
-	>=dev-libs/glib-2.24.1-r1
-	dev-libs/libxml2
-	dev-libs/protobuf:=
-	dev-libs/qjson
-	>=dev-qt/qtcore-4.5:4
-	>=dev-qt/qtgui-4.5:4
-	>=dev-qt/qtopengl-4.5:4
-	>=dev-qt/qtsql-4.5:4[sqlite]
-	>=media-libs/chromaprint-0.6
-	media-libs/gstreamer:1.0
-	media-libs/gst-plugins-base:1.0
-	media-libs/libechonest:=[qt4]
-	>=media-libs/libmygpo-qt-1.0.8
-	>=media-libs/taglib-1.8[mp4]
-	sys-libs/zlib
-	virtual/glu
-	virtual/opengl
-	x11-libs/libX11
-	cdda? ( dev-libs/libcdio )
-	dbus? ( >=dev-qt/qtdbus-4.5:4 )
-	ipod? ( >=media-libs/libgpod-0.8.0 )
-	lastfm? ( >=media-libs/liblastfm-1[qt4(+)] )
-	mtp? ( >=media-libs/libmtp-1.0.0 )
-	moodbar? ( sci-libs/fftw:3.0 )
-	projectm? ( media-libs/glew:= )
-"
-# now only presets are used, libprojectm is internal
-# https://github.com/clementine-player/Clementine/tree/master/3rdparty/libprojectm/patches
-# r1966 "Compile with a static sqlite by default, since Qt 4.7 doesn't seem to expose the symbols we need to use FTS"
-RDEPEND="${COMMON_DEPEND}
-	dbus? ( udisks? ( sys-fs/udisks:2 ) )
-	mms? ( media-plugins/gst-plugins-libmms:1.0 )
-	mtp? ( gnome-base/gvfs )
-	projectm? ( >=media-libs/libprojectm-1.2.0 )
-	media-plugins/gst-plugins-meta:1.0
-	media-plugins/gst-plugins-soup:1.0
-	media-plugins/gst-plugins-taglib:1.0
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-libs/boost-1.39
-	virtual/pkgconfig
-	sys-devel/gettext
-	dev-qt/qttest:4
-	dev-cpp/gmock
-	box? ( dev-cpp/sparsehash )
-	dropbox? ( dev-cpp/sparsehash )
-	googledrive? ( dev-cpp/sparsehash )
-	skydrive? ( dev-cpp/sparsehash )
-	ubuntu-one? ( dev-cpp/sparsehash )
-	test? ( gnome-base/gsettings-desktop-schemas )
-"
-DOCS="Changelog"
-
-# https://github.com/clementine-player/Clementine/issues/3935
-RESTRICT="test"
-
-MY_P="${P/_}"
-# Switch to ^ when we switch to EAPI=6.
-[[ ${PV} == *9999* ]] || \
-S="${WORKDIR}/C${MY_P:1}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.3_rc1-cmake.patch
-	"${FILESDIR}"/${PN}-1.3_rc1-fix-tokenizer.patch
-)
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# some tests fail or hang
-	sed -i \
-		-e '/add_test_file(translations_test.cpp/d' \
-		tests/CMakeLists.txt || die
-}
-
-src_configure() {
-	local langs x
-	for x in ${LANGS}; do
-		use linguas_${x} && langs+=" ${x}"
-	done
-
-	# spotify is not in portage
-	local mycmakeargs=(
-		-DBUILD_WERROR=OFF
-		-DLINGUAS="${langs}"
-		-DBUNDLE_PROJECTM_PRESETS=OFF
-		-DUSE_SYSTEM_PROJECTM=ON
-		$(cmake-utils_use cdda ENABLE_AUDIOCD)
-		$(cmake-utils_use dbus ENABLE_DBUS)
-		$(cmake-utils_use udisks ENABLE_DEVICEKIT)
-		$(cmake-utils_use ipod ENABLE_LIBGPOD)
-		$(cmake-utils_use lastfm ENABLE_LIBLASTFM)
-		$(cmake-utils_use mtp ENABLE_LIBMTP)
-		$(cmake-utils_use moodbar ENABLE_MOODBAR)
-		-DENABLE_GIO=ON
-		$(cmake-utils_use wiimote ENABLE_WIIMOTEDEV)
-		$(cmake-utils_use projectm ENABLE_VISUALISATIONS)
-		$(usex projectm '-DUSE_SYSTEM_PROJECTM=ON' '')
-		$(cmake-utils_use box ENABLE_BOX)
-		$(cmake-utils_use dropbox ENABLE_DROPBOX)
-		$(cmake-utils_use googledrive ENABLE_GOOGLE_DRIVE)
-		$(cmake-utils_use skydrive ENABLE_SKYDRIVE)
-		$(cmake-utils_use ubuntu-one ENABLE_UBUNTU_ONE)
-		-DENABLE_SPOTIFY_BLOB=OFF
-		-DENABLE_BREAKPAD=OFF
-		#$(cmake-utils_use !system-sqlite STATIC_SQLITE)
-		#$(cmake-utils_use system-sqlite I_HATE_MY_USERS)
-		#$(cmake-utils_use system-sqlite MY_USERS_WILL_SUFFER_BECAUSE_OF_ME)
-		-DUSE_BUILTIN_TAGLIB=OFF
-		-DUSE_SYSTEM_GMOCK=ON
-		)
-
-	use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT
-
-	cmake-utils_src_configure
-}
-
-src_test() {
-	cd "${CMAKE_BUILD_DIR}" || die
-	Xemake test
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-}
diff --git a/media-sound/clementine/clementine-9999.ebuild b/media-sound/clementine/clementine-9999.ebuild
index debdf11b3bf8..bfac234d663d 100644
--- a/media-sound/clementine/clementine-9999.ebuild
+++ b/media-sound/clementine/clementine-9999.ebuild
@@ -56,6 +56,7 @@ COMMON_DEPEND="
 	mtp? ( >=media-libs/libmtp-1.0.0 )
 	moodbar? ( sci-libs/fftw:3.0 )
 	projectm? ( media-libs/glew:= )
+	>=dev-libs/crypto++-5.6.2-r4
 "
 # now only presets are used, libprojectm is internal
 # https://github.com/clementine-player/Clementine/tree/master/3rdparty/libprojectm/patches
@@ -92,10 +93,7 @@ MY_P="${P/_}"
 [[ ${PV} == *9999* ]] || \
 S="${WORKDIR}/C${MY_P:1}"
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.3_rc1-cmake.patch
-	"${FILESDIR}"/${PN}-1.3_rc1-fix-tokenizer.patch
-)
+PATCHES=( "${FILESDIR}"/${PN}-1.3-fix-tokenizer.patch )
 
 src_prepare() {
 	cmake-utils_src_prepare
diff --git a/media-sound/clementine/files/clementine-1.3_rc1-fix-tokenizer.patch b/media-sound/clementine/files/clementine-1.3-fix-tokenizer.patch
similarity index 100%
rename from media-sound/clementine/files/clementine-1.3_rc1-fix-tokenizer.patch
rename to media-sound/clementine/files/clementine-1.3-fix-tokenizer.patch
diff --git a/media-sound/clementine/files/clementine-1.3_rc1-cmake.patch b/media-sound/clementine/files/clementine-1.3_rc1-cmake.patch
deleted file mode 100644
index 8aefe97c124c..000000000000
--- a/media-sound/clementine/files/clementine-1.3_rc1-cmake.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- Clementine-1.3rc1/CMakeLists.txt
-+++ Clementine-1.3rc1/CMakeLists.txt
-@@ -60,7 +60,7 @@
- 
- pkg_check_modules(CDIO libcdio)
- pkg_check_modules(CHROMAPRINT REQUIRED libchromaprint)
--pkg_search_module(CRYPTOPP cryptopp libcrypto++)
-+#pkg_search_module(CRYPTOPP cryptopp libcrypto++)
- pkg_check_modules(GIO gio-2.0)
- pkg_check_modules(GLIB REQUIRED glib-2.0)
- pkg_check_modules(GOBJECT REQUIRED gobject-2.0)
-@@ -71,7 +71,7 @@
- pkg_check_modules(GSTREAMER_TAG REQUIRED gstreamer-tag-1.0)
- pkg_check_modules(LIBGPOD libgpod-1.0>=0.7.92)
- pkg_check_modules(LIBMTP libmtp>=1.0)
--pkg_check_modules(LIBMYGPO_QT libmygpo-qt>=1.0.9)
-+pkg_check_modules(LIBMYGPO_QT libmygpo-qt>=1.0.8)
- pkg_check_modules(LIBPULSE libpulse)
- pkg_check_modules(LIBXML libxml-2.0)
- pkg_check_modules(QJSON REQUIRED QJson)
-@@ -275,13 +275,14 @@
- 
- optional_component(VISUALISATIONS ON "Visualisations")
- 
--if(NOT HAVE_SPOTIFY_BLOB AND NOT CRYPTOPP_FOUND)
--  message(FATAL_ERROR "Either crypto++ must be available or the non-GPL Spotify "
--          "code must be compiled in")
--elseif(CRYPTOPP_FOUND)
-+#if(NOT HAVE_SPOTIFY_BLOB AND NOT CRYPTOPP_FOUND)
-+#  message(FATAL_ERROR "Either crypto++ must be available or the non-GPL Spotify "
-+#          "code must be compiled in")
-+#elseif(CRYPTOPP_FOUND)
-   set(HAVE_CRYPTOPP ON)
--  set(HAVE_SPOTIFY_DOWNLOADER ON)
--endif()
-+  set(HAVE_SPOTIFY_DOWNLOADER OFF)
-+  set(HAVE_SPOTIFY_BLOB OFF)
-+#endif()
- 
- # Find DBus if it's enabled
- if (HAVE_DBUS)
diff --git a/media-sound/ncmpcpp/Manifest b/media-sound/ncmpcpp/Manifest
index 9fd1a305421a..f79d7db01911 100644
--- a/media-sound/ncmpcpp/Manifest
+++ b/media-sound/ncmpcpp/Manifest
@@ -1,4 +1,3 @@
-DIST ncmpcpp-0.7.1.tar.bz2 442512 SHA256 73b76ca9a7b08b220c49251195b9a929768759bd03cf6956b74a2f218b2e2fdf SHA512 0b01e13b9cb0964d5e7ae32b88b6fc4d65ff11a7f9f45c57dd2260ce5e188005b6d728b9c23ce54559920ca03ff80fbf90b94846ac3ff387804bf413e43f9c56 WHIRLPOOL c8d3ae147022313a333a9901a15e4b0ea0d3553b7c35943542a742dde551f756131222166007a4c02f1434264c7160ee1fb00100371df35f49b4977d07df4bc0
-DIST ncmpcpp-0.7.2.tar.bz2 442457 SHA256 6392f5eb98c4f130639e198200ef3db0b873b9594b65fe807ee73293ceb4093b SHA512 6ecc02694ecc6ff10e3a6d89d0b227385b1ab36c30afce57a8a8b74725063154736c78141d3fdaafb3a008e80855bc206dbf7e4aefc8486e01f300354967f1f8 WHIRLPOOL 8fbe3e3dd8ef43dfad466ccc2657455837ef4c95ae8164fbe0e60fcb5a4c239bf654c1392b5a3fec7bc8e64dbea3aba7e9dfde9e9d28999fdb95294d49a0429c
 DIST ncmpcpp-0.7.3.tar.bz2 442209 SHA256 2c8b29435ca4fd845400cee7c9fd50a731bee215e92fd7e98a7446c84136b212 SHA512 6314b97f36014ade92b3a73640bf529625d75d20a68fb9b2999de579095e37c46e1951b22b0a849bd8e23998e72cfa77f717cff914b7e20dccc0a918cb739732 WHIRLPOOL f50986be48ee8032295da6b9b806e03762f574f889ebcb2b9e54aeb0ab8fbf372cb2d79152e37c870e4a39f27030087146bc14ba5d03ea20bbe87dd52e35eaf0
+DIST ncmpcpp-0.7.4.tar.bz2 442743 SHA256 d70425f1dfab074a12a206ddd8f37f663bce2bbdc0a20f7ecf290ebe051f1e63 SHA512 e5171bd095baefcdf1da1e4d3de3d14a22035584da9b7ec9f176c0fb32bee61a25d989c3405711e512333b10f38a5575e90ec733afeaf7aff995386396f3b918 WHIRLPOOL 57f771c83bbd9afcbeb8b7b8b7a50f0e3fbc95eb74b1ad6b199358431f5f80ed891d1c27902369cf29f9a29622fe88a83aa2fcf7053e0543afb7c23486413999
 DIST ncmpcpp-0.7.tar.bz2 442319 SHA256 50924ff0502c9b90ce1b679638769122defd03bc85eb8a95924c62c8d303ff77 SHA512 00477a9044e46c5d0ce4687b16d59d81fc31323a9c23eeebb6701e20c2fe3c50e3e56030844b68bdcf319af04c1f1a3bd50d0732cc9b4614488a918165c2f112 WHIRLPOOL 2bc6ba5935bef72e46b568a98f49a87720d48c0d9699ab35abf3f2f7ed250bc331fc165372d3f352ed5f16ae16da614c3b6c1c6e309a2d1b8d94abefb5e66a0b
diff --git a/media-sound/ncmpcpp/ncmpcpp-0.7.1.ebuild b/media-sound/ncmpcpp/ncmpcpp-0.7.1.ebuild
deleted file mode 100644
index 14324db42998..000000000000
--- a/media-sound/ncmpcpp/ncmpcpp-0.7.1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils
-
-DESCRIPTION="featureful ncurses based MPD client inspired by ncmpc"
-HOMEPAGE="http://ncmpcpp.rybczak.net/"
-SRC_URI="http://ncmpcpp.rybczak.net/stable/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="clock curl outputs taglib unicode visualizer"
-
-RDEPEND="
-	!dev-libs/boost:0/1.57.0
-	>=media-libs/libmpdclient-2.1
-	dev-libs/boost:=[nls,threads]
-	sys-libs/ncurses:=[unicode?]
-	sys-libs/readline:*
-	curl? ( net-misc/curl )
-	taglib? ( media-libs/taglib )
-	unicode? ( dev-libs/boost:=[icu] )
-	visualizer? ( sci-libs/fftw:3.0 )
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	sed -i -e '/^docdir/d' {,doc/}Makefile{.am,.in} || die
-	sed -i -e 's|COPYING||g' Makefile{.am,.in} || die
-}
-
-src_configure() {
-	econf \
-		$(use_enable clock) \
-		$(use_enable outputs) \
-		$(use_enable unicode) \
-		$(use_enable visualizer) \
-		$(use_with curl) \
-		$(use_with taglib) \
-		$(use_with visualizer fftw) \
-		--docdir=/usr/share/doc/${PF}
-}
-
-src_install() {
-	default
-
-	dodoc doc/{bindings,config}
-}
-
-pkg_postinst() {
-	echo
-	elog "Example configuration files have been installed at"
-	elog "${ROOT}usr/share/doc/${PF}"
-	elog "${P} uses ~/.ncmpcpp/config and ~/.ncmpcpp/bindings"
-	elog "as user configuration files."
-	echo
-	if use visualizer; then
-	elog "If you want to use the visualizer, you need mpd with fifo enabled."
-	echo
-	fi
-}
diff --git a/media-sound/ncmpcpp/ncmpcpp-0.7.2.ebuild b/media-sound/ncmpcpp/ncmpcpp-0.7.4.ebuild
similarity index 94%
rename from media-sound/ncmpcpp/ncmpcpp-0.7.2.ebuild
rename to media-sound/ncmpcpp/ncmpcpp-0.7.4.ebuild
index 14324db42998..114ea3cb847c 100644
--- a/media-sound/ncmpcpp/ncmpcpp-0.7.2.ebuild
+++ b/media-sound/ncmpcpp/ncmpcpp-0.7.4.ebuild
@@ -22,8 +22,11 @@ RDEPEND="
 	sys-libs/readline:*
 	curl? ( net-misc/curl )
 	taglib? ( media-libs/taglib )
-	unicode? ( dev-libs/boost:=[icu] )
-	visualizer? ( sci-libs/fftw:3.0 )
+	unicode? (
+		dev-libs/boost:=[icu]
+		dev-libs/icu:=
+	)
+	visualizer? ( sci-libs/fftw:3.0= )
 "
 DEPEND="
 	${RDEPEND}
diff --git a/media-tv/mythtv/mythtv-0.28.ebuild b/media-tv/mythtv/mythtv-0.28.ebuild
index 92a9d3ed0414..75351857e4fb 100644
--- a/media-tv/mythtv/mythtv-0.28.ebuild
+++ b/media-tv/mythtv/mythtv-0.28.ebuild
@@ -34,6 +34,7 @@ REQUIRED_USE="
 	theora? ( vorbis )"
 
 COMMON="
+	media-gfx/exiv2:=
 	>=media-libs/freetype-2.0:=
 	>=media-sound/lame-3.93.1
 	sys-libs/zlib:=
@@ -46,10 +47,13 @@ COMMON="
 	dev-qt/qtcore:5=
 	dev-qt/qtdbus:5=
 	dev-qt/qtgui:5=
+	dev-qt/qtnetwork:5=
 	dev-qt/qtscript:5=
 	dev-qt/qtsql:5=[mysql]
 	dev-qt/qtopengl:5=
 	dev-qt/qtwebkit:5=
+	dev-qt/qtwidgets:5=
+	dev-qt/qtxml:5=
 	x11-misc/wmctrl:=
 	virtual/mysql
 	virtual/opengl:=
@@ -264,6 +268,7 @@ src_configure() {
 		--extra-cflags="${CFLAGS}" \
 		--extra-cxxflags="${CXXFLAGS}" \
 		--extra-ldflags="${LDFLAGS}" \
+		--qmake=/usr/lib/qt5/bin/qmake \
 		${myconf} || die "configure died"
 }
 
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 598faa260929..ad5b5c458342 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Sat, 16 Apr 2016 20:09:25 +0000
+Sun, 17 Apr 2016 17:09:15 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 598faa260929..ad5b5c458342 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Sat, 16 Apr 2016 20:09:25 +0000
+Sun, 17 Apr 2016 17:09:15 +0000
diff --git a/metadata/md5-cache/app-admin/conserver-8.1.18 b/metadata/md5-cache/app-admin/conserver-8.1.18
index ce941efc4d0a..59bb0fa3e933 100644
--- a/metadata/md5-cache/app-admin/conserver-8.1.18
+++ b/metadata/md5-cache/app-admin/conserver-8.1.18
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=ssl? ( >=dev-libs/openssl-0.9.6g ) pam? ( virtual/pam ) tcpd? ( sys-apps/tcp-wrappers ) debug? ( dev-libs/dmalloc ) kerberos? ( virtual/krb5 net-libs/libgssglue ) ssl? ( dev-libs/openssl:0= ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=ssl? ( >=dev-libs/openssl-0.9.6g ) pam? ( virtual/pam ) tcpd? ( sys-apps/tcp-wrappers ) debug? ( dev-libs/dmalloc ) kerberos? ( virtual/krb5 net-libs/libgssglue ) ssl? ( dev-libs/openssl:0 ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Serial Console Manager
 EAPI=4
 HOMEPAGE=http://www.conserver.com/
@@ -9,5 +9,5 @@ LICENSE=BSD GPL-2
 RDEPEND=ssl? ( >=dev-libs/openssl-0.9.6g ) pam? ( virtual/pam ) tcpd? ( sys-apps/tcp-wrappers ) debug? ( dev-libs/dmalloc ) kerberos? ( virtual/krb5 net-libs/libgssglue ) pam? ( >=sys-auth/pambase-20080219.1 )
 SLOT=0
 SRC_URI=http://www.conserver.com/conserver-8.1.18.tar.gz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	libtool	4890219c51da247200223277f993e054	multilib	23ae8c186171e6476af098d2a50d0ee0	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	ssl-cert	b29ef3f715f3a76f1bf807b7e8751096	toolchain-funcs	d513d423d449877e49d99af3f7af7acb
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	libtool	4890219c51da247200223277f993e054	multilib	23ae8c186171e6476af098d2a50d0ee0	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	ssl-cert	6f7d720c036362122b0bfb4461e56a11	toolchain-funcs	d513d423d449877e49d99af3f7af7acb
 _md5_=2eb18a226842e7833602008fff2c68ed
diff --git a/metadata/md5-cache/app-admin/conserver-8.1.18-r1 b/metadata/md5-cache/app-admin/conserver-8.1.18-r1
index 7d8c1ee58834..365943c1c314 100644
--- a/metadata/md5-cache/app-admin/conserver-8.1.18-r1
+++ b/metadata/md5-cache/app-admin/conserver-8.1.18-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) pam? ( virtual/pam ) tcpd? ( sys-apps/tcp-wrappers ) debug? ( dev-libs/dmalloc ) kerberos? ( virtual/krb5 net-libs/libgssglue ) ssl? ( dev-libs/openssl:0= ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) pam? ( virtual/pam ) tcpd? ( sys-apps/tcp-wrappers ) debug? ( dev-libs/dmalloc ) kerberos? ( virtual/krb5 net-libs/libgssglue ) ssl? ( dev-libs/openssl:0 ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Serial Console Manager
 EAPI=5
 HOMEPAGE=http://www.conserver.com/
@@ -9,5 +9,5 @@ LICENSE=BSD GPL-2
 RDEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) pam? ( virtual/pam ) tcpd? ( sys-apps/tcp-wrappers ) debug? ( dev-libs/dmalloc ) kerberos? ( virtual/krb5 net-libs/libgssglue ) pam? ( >=sys-auth/pambase-20080219.1 )
 SLOT=0
 SRC_URI=http://www.conserver.com/conserver-8.1.18.tar.gz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	libtool	4890219c51da247200223277f993e054	multilib	23ae8c186171e6476af098d2a50d0ee0	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	ssl-cert	b29ef3f715f3a76f1bf807b7e8751096	toolchain-funcs	d513d423d449877e49d99af3f7af7acb
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	libtool	4890219c51da247200223277f993e054	multilib	23ae8c186171e6476af098d2a50d0ee0	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	ssl-cert	6f7d720c036362122b0bfb4461e56a11	toolchain-funcs	d513d423d449877e49d99af3f7af7acb
 _md5_=bffd64038c0cd4f6da79064d8f5350aa
diff --git a/metadata/md5-cache/app-admin/webmin-1.791 b/metadata/md5-cache/app-admin/webmin-1.791
index b2d66d5904b5..b8042b2433b2 100644
--- a/metadata/md5-cache/app-admin/webmin-1.791
+++ b/metadata/md5-cache/app-admin/webmin-1.791
@@ -1,5 +1,5 @@
 DEFINED_PHASES=config install postinst postrm preinst prepare prerm
-DEPEND=virtual/perl-MIME-Base64 virtual/perl-Socket virtual/perl-Sys-Syslog virtual/perl-Time-HiRes virtual/perl-Time-Local dev-perl/Authen-Libwrap dev-perl/IO-Tty dev-perl/MD5 dev-perl/Net-SSLeay dev-perl/Authen-PAM dev-perl/Sys-Hostname-Long >=net-dns/dnssec-tools-1.13 !minimal? ( mysql? ( dev-perl/DBD-mysql ) postgres? ( dev-perl/DBD-Pg ) ldap? ( dev-perl/perl-ldap ) dev-perl/XML-Generator dev-perl/XML-Parser ) ssl? ( dev-libs/openssl:0= ) virtual/pkgconfig
+DEPEND=virtual/perl-MIME-Base64 virtual/perl-Socket virtual/perl-Sys-Syslog virtual/perl-Time-HiRes virtual/perl-Time-Local dev-perl/Authen-Libwrap dev-perl/IO-Tty dev-perl/MD5 dev-perl/Net-SSLeay dev-perl/Authen-PAM dev-perl/Sys-Hostname-Long >=net-dns/dnssec-tools-1.13 !minimal? ( mysql? ( dev-perl/DBD-mysql ) postgres? ( dev-perl/DBD-Pg ) ldap? ( dev-perl/perl-ldap ) dev-perl/XML-Generator dev-perl/XML-Parser ) ssl? ( dev-libs/openssl:0 ) virtual/pkgconfig
 DESCRIPTION=A web-based Unix systems administration interface
 EAPI=5
 HOMEPAGE=http://www.webmin.com/
@@ -10,5 +10,5 @@ RDEPEND=virtual/perl-MIME-Base64 virtual/perl-Socket virtual/perl-Sys-Syslog vir
 REQUIRED_USE=minimal? ( !mysql !postgres !ldap )
 SLOT=0
 SRC_URI=minimal? ( mirror://sourceforge/webadmin/webmin-1.791-minimal.tar.gz ) !minimal? ( mirror://sourceforge/webadmin/webmin-1.791.tar.gz )
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	23ae8c186171e6476af098d2a50d0ee0	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	ssl-cert	b29ef3f715f3a76f1bf807b7e8751096	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	d513d423d449877e49d99af3f7af7acb
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	23ae8c186171e6476af098d2a50d0ee0	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	ssl-cert	6f7d720c036362122b0bfb4461e56a11	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	d513d423d449877e49d99af3f7af7acb
 _md5_=a7240496f5ba53626c9606abc9474879
diff --git a/metadata/md5-cache/app-arch/file-roller-3.14.2 b/metadata/md5-cache/app-arch/file-roller-3.14.2
deleted file mode 100644
index ccc4c1ccb3a0..000000000000
--- a/metadata/md5-cache/app-arch/file-roller-3.14.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=>=app-arch/libarchive-3:= >=dev-libs/glib-2.36:2 >=dev-libs/json-glib-0.14 >=x11-libs/gtk+-3.13.2:3 >=x11-libs/libnotify-0.4.3:= sys-apps/file x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/pango nautilus? ( >=gnome-base/nautilus-3 ) packagekit? ( app-admin/packagekit-base ) dev-util/desktop-file-utils >=dev-util/intltool-0.40.0 sys-devel/gettext virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Archive manager for GNOME
-EAPI=5
-HOMEPAGE=http://fileroller.sourceforge.net/ https://wiki.gnome.org/Apps/FileRoller
-IUSE=nautilus packagekit
-KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux
-LICENSE=GPL-2+ CC-BY-SA-3.0
-RDEPEND=>=app-arch/libarchive-3:= >=dev-libs/glib-2.36:2 >=dev-libs/json-glib-0.14 >=x11-libs/gtk+-3.13.2:3 >=x11-libs/libnotify-0.4.3:= sys-apps/file x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/pango nautilus? ( >=gnome-base/nautilus-3 ) packagekit? ( app-admin/packagekit-base )
-SLOT=0
-SRC_URI=mirror://gnome/sources/file-roller/3.14/file-roller-3.14.2.tar.xz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	21c81ea94c12e45a63f7f14fba666e3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multilib	23ae8c186171e6476af098d2a50d0ee0	readme.gentoo	df3fc8fdaf5a519e7d48c83e7592c95f	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=391904383271375e37e56e27b850c45b
diff --git a/metadata/md5-cache/app-arch/file-roller-3.16.4 b/metadata/md5-cache/app-arch/file-roller-3.16.4
deleted file mode 100644
index 3a01ee9a181d..000000000000
--- a/metadata/md5-cache/app-arch/file-roller-3.16.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=>=app-arch/libarchive-3:= >=dev-libs/glib-2.36:2 >=dev-libs/json-glib-0.14 >=x11-libs/gtk+-3.13.2:3 >=x11-libs/libnotify-0.4.3:= sys-apps/file x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/pango nautilus? ( >=gnome-base/nautilus-3 ) packagekit? ( app-admin/packagekit-base ) dev-util/desktop-file-utils >=dev-util/intltool-0.40.0 dev-util/itstool sys-devel/gettext virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Archive manager for GNOME
-EAPI=5
-HOMEPAGE=https://wiki.gnome.org/Apps/FileRoller
-IUSE=nautilus packagekit
-KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux
-LICENSE=GPL-2+ CC-BY-SA-3.0
-RDEPEND=>=app-arch/libarchive-3:= >=dev-libs/glib-2.36:2 >=dev-libs/json-glib-0.14 >=x11-libs/gtk+-3.13.2:3 >=x11-libs/libnotify-0.4.3:= sys-apps/file x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/pango nautilus? ( >=gnome-base/nautilus-3 ) packagekit? ( app-admin/packagekit-base )
-SLOT=0
-SRC_URI=mirror://gnome/sources/file-roller/3.16/file-roller-3.16.4.tar.xz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	21c81ea94c12e45a63f7f14fba666e3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multilib	23ae8c186171e6476af098d2a50d0ee0	readme.gentoo	df3fc8fdaf5a519e7d48c83e7592c95f	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=c62b57a07980e119374ea2a00f778e49
diff --git a/metadata/md5-cache/app-arch/file-roller-3.16.3 b/metadata/md5-cache/app-arch/file-roller-3.16.5
similarity index 83%
rename from metadata/md5-cache/app-arch/file-roller-3.16.3
rename to metadata/md5-cache/app-arch/file-roller-3.16.5
index dce4cc04676c..489188d04713 100644
--- a/metadata/md5-cache/app-arch/file-roller-3.16.3
+++ b/metadata/md5-cache/app-arch/file-roller-3.16.5
@@ -8,6 +8,6 @@ KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd
 LICENSE=GPL-2+ CC-BY-SA-3.0
 RDEPEND=>=app-arch/libarchive-3:= >=dev-libs/glib-2.36:2 >=dev-libs/json-glib-0.14 >=x11-libs/gtk+-3.13.2:3 >=x11-libs/libnotify-0.4.3:= sys-apps/file x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/pango nautilus? ( >=gnome-base/nautilus-3 ) packagekit? ( app-admin/packagekit-base )
 SLOT=0
-SRC_URI=mirror://gnome/sources/file-roller/3.16/file-roller-3.16.3.tar.xz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	21c81ea94c12e45a63f7f14fba666e3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multilib	23ae8c186171e6476af098d2a50d0ee0	readme.gentoo	df3fc8fdaf5a519e7d48c83e7592c95f	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=73480fed47d5ae9e119fb36696b6fda1
+SRC_URI=mirror://gnome/sources/file-roller/3.16/file-roller-3.16.5.tar.xz
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	21c81ea94c12e45a63f7f14fba666e3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multilib	23ae8c186171e6476af098d2a50d0ee0	readme.gentoo-r1	03878c06495db70bc36bd717383c09f7	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=b3152a1f633a4ae127cff258d6b19aaa
diff --git a/metadata/md5-cache/app-crypt/signify-17 b/metadata/md5-cache/app-crypt/signify-17
new file mode 100644
index 000000000000..8b1209fb4f07
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/signify-17
@@ -0,0 +1,9 @@
+DEFINED_PHASES=-
+DESCRIPTION=Cryptographically sign and verify files
+EAPI=5
+HOMEPAGE=http://www.openbsd.org/ https://github.com/aperezdc/signify
+KEYWORDS=~amd64
+LICENSE=BSD-1
+SLOT=0
+SRC_URI=https://github.com/aperezdc/signify/archive/v17.tar.gz -> signify-17.tar.gz
+_md5_=9eb9a109a24885bf130f278529e3f56f
diff --git a/metadata/md5-cache/app-emulation/containerd-0.2.0 b/metadata/md5-cache/app-emulation/containerd-0.2.0
new file mode 100644
index 000000000000..d1b1cfa711e4
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/containerd-0.2.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare unpack
+DEPEND=>=dev-lang/go-1.4.2:=
+DESCRIPTION=A daemon to control runC
+EAPI=6
+HOMEPAGE=https://containerd.tools
+IUSE=+seccomp
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=app-emulation/runc seccomp? ( sys-libs/libseccomp )
+SLOT=0
+SRC_URI=https://github.com/docker/containerd/archive/v0.2.0.tar.gz -> containerd-0.2.0.tar.gz
+_eclasses_=golang-base	08fe6e0e2b4750daff8887a7f0e1f873	golang-vcs-snapshot	1caa6d8238d2378ad688ae068ff22e5a
+_md5_=77e0ee1b610d8524caa4964441459e38
diff --git a/metadata/md5-cache/app-emulation/containerd-9999 b/metadata/md5-cache/app-emulation/containerd-9999
new file mode 100644
index 000000000000..6da94751a8b6
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/containerd-9999
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install prepare unpack
+DEPEND=>=dev-lang/go-1.4.2:=
+DESCRIPTION=A daemon to control runC
+EAPI=6
+HOMEPAGE=https://containerd.tools
+IUSE=+seccomp
+LICENSE=Apache-2.0
+RDEPEND=app-emulation/runc seccomp? ( sys-libs/libseccomp )
+SLOT=0
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	golang-base	08fe6e0e2b4750daff8887a7f0e1f873	golang-vcs	c46e447dc94466eabb5ce867f21b85bf	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb
+_md5_=77e0ee1b610d8524caa4964441459e38
diff --git a/metadata/md5-cache/app-emulation/rkt-1.4.0 b/metadata/md5-cache/app-emulation/rkt-1.4.0
new file mode 100644
index 000000000000..1db5102645e7
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/rkt-1.4.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=>=dev-lang/go-1.5 app-arch/cpio app-crypt/trousers sys-fs/squashfs-tools dev-perl/Capture-Tiny !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DESCRIPTION=A CLI for running app containers, and an implementation of the App Container Spec.
+EAPI=5
+HOMEPAGE=https://github.com/coreos/rkt
+IUSE=doc examples +rkt_stage1_coreos +rkt_stage1_fly rkt_stage1_host rkt_stage1_kvm rkt_stage1_src +actool systemd
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=!app-emulation/rocket rkt_stage1_host? ( systemd? ( >=sys-apps/systemd-222 app-shells/bash:0 ) )
+REQUIRED_USE=|| ( rkt_stage1_coreos rkt_stage1_fly rkt_stage1_host rkt_stage1_kvm rkt_stage1_src ) rkt_stage1_host? ( systemd )
+SLOT=0
+SRC_URI=https://github.com/coreos/rkt/archive/v1.4.0.tar.gz -> rkt-1.4.0.tar.gz rkt_stage1_coreos? ( http://alpha.release.core-os.net/amd64-usr/991.0.0/coreos_production_pxe_image.cpio.gz -> rkt-pxe-991.0.0.img ) rkt_stage1_kvm? ( https://kernel.googlesource.com/pub/scm/linux/kernel/git/will/kvmtool/+archive/3c8aec9e2b5066412390559629dabeb7816ee8f2.tar.gz -> kvmtool-3c8aec9e2b5066412390559629dabeb7816ee8f2.tar.gz mirror://kernel/linux/kernel/v4.x/linux-4.3.1.tar.xz http://alpha.release.core-os.net/amd64-usr/991.0.0/coreos_production_pxe_image.cpio.gz -> rkt-pxe-991.0.0.img ) rkt_stage1_src? ( https://github.com/systemd/systemd/archive/v225.tar.gz -> systemd-225.tar.gz )
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-utils	419811142edf3516b0d0cf1a254d93cb	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	libtool	4890219c51da247200223277f993e054	multilib	23ae8c186171e6476af098d2a50d0ee0	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	d513d423d449877e49d99af3f7af7acb
+_md5_=0c338f4ed75a5065089a2d1a057df935
diff --git a/metadata/md5-cache/app-mobilephone/kannel-1.4.3-r1 b/metadata/md5-cache/app-mobilephone/kannel-1.4.3-r1
index 60b7c30f176b..9da56e90e9d8 100644
--- a/metadata/md5-cache/app-mobilephone/kannel-1.4.3-r1
+++ b/metadata/md5-cache/app-mobilephone/kannel-1.4.3-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=config configure install postinst prepare setup
-DEPEND=sys-libs/e2fsprogs-libs dev-libs/libxml2 dev-lang/perl sys-libs/zlib ssl? ( dev-libs/openssl ) mysql? ( virtual/mysql ) sqlite? ( dev-db/sqlite:3 ) postgres? ( dev-db/postgresql[server] ) pcre? ( dev-libs/libpcre ) pam? ( virtual/pam ) >=sys-devel/bison-2.2 doc? ( media-gfx/transfig app-text/jadetex app-text/docbook-dsssl-stylesheets app-text/docbook-sgml-dtd:3.1 ) !<sys-devel/gettext-0.18.1.1-r3 sys-devel/automake >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ssl? ( dev-libs/openssl:0= )
+DEPEND=sys-libs/e2fsprogs-libs dev-libs/libxml2 dev-lang/perl sys-libs/zlib ssl? ( dev-libs/openssl ) mysql? ( virtual/mysql ) sqlite? ( dev-db/sqlite:3 ) postgres? ( dev-db/postgresql[server] ) pcre? ( dev-libs/libpcre ) pam? ( virtual/pam ) >=sys-devel/bison-2.2 doc? ( media-gfx/transfig app-text/jadetex app-text/docbook-dsssl-stylesheets app-text/docbook-sgml-dtd:3.1 ) !<sys-devel/gettext-0.18.1.1-r3 sys-devel/automake >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ssl? ( dev-libs/openssl:0 )
 DESCRIPTION=Powerful SMS and WAP gateway
 EAPI=2
 HOMEPAGE=http://www.kannel.org/
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/e2fsprogs-libs dev-libs/libxml2 dev-lang/perl sys-libs/zlib ssl
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.kannel.org/download/1.4.3/gateway-1.4.3.tar.gz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	libtool	4890219c51da247200223277f993e054	multilib	23ae8c186171e6476af098d2a50d0ee0	ssl-cert	b29ef3f715f3a76f1bf807b7e8751096	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	user	906f3c8eb3a2350a4f1191a89baa3e46
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	libtool	4890219c51da247200223277f993e054	multilib	23ae8c186171e6476af098d2a50d0ee0	ssl-cert	6f7d720c036362122b0bfb4461e56a11	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	user	906f3c8eb3a2350a4f1191a89baa3e46
 _md5_=8d0c0e6ea3920af5a45238d0d2e4d509
diff --git a/metadata/md5-cache/app-mobilephone/kannel-1.5.0 b/metadata/md5-cache/app-mobilephone/kannel-1.5.0
index 0fa50947301c..a55833ca149e 100644
--- a/metadata/md5-cache/app-mobilephone/kannel-1.5.0
+++ b/metadata/md5-cache/app-mobilephone/kannel-1.5.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=config configure install postinst prepare setup
-DEPEND=sys-libs/e2fsprogs-libs dev-libs/libxml2 dev-lang/perl sys-libs/zlib ssl? ( dev-libs/openssl ) mysql? ( virtual/mysql ) sqlite? ( dev-db/sqlite:3 ) postgres? ( dev-db/postgresql[server] ) pcre? ( dev-libs/libpcre ) pam? ( virtual/pam ) >=sys-devel/bison-2.2 doc? ( media-gfx/transfig app-text/jadetex app-text/docbook-dsssl-stylesheets app-text/docbook-sgml-dtd:3.1 ) !<sys-devel/gettext-0.18.1.1-r3 sys-devel/automake >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ssl? ( dev-libs/openssl:0= )
+DEPEND=sys-libs/e2fsprogs-libs dev-libs/libxml2 dev-lang/perl sys-libs/zlib ssl? ( dev-libs/openssl ) mysql? ( virtual/mysql ) sqlite? ( dev-db/sqlite:3 ) postgres? ( dev-db/postgresql[server] ) pcre? ( dev-libs/libpcre ) pam? ( virtual/pam ) >=sys-devel/bison-2.2 doc? ( media-gfx/transfig app-text/jadetex app-text/docbook-dsssl-stylesheets app-text/docbook-sgml-dtd:3.1 ) !<sys-devel/gettext-0.18.1.1-r3 sys-devel/automake >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ssl? ( dev-libs/openssl:0 )
 DESCRIPTION=Powerful SMS and WAP gateway
 EAPI=5
 HOMEPAGE=http://www.kannel.org/
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/e2fsprogs-libs dev-libs/libxml2 dev-lang/perl sys-libs/zlib ssl
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.kannel.org/download/1.5.0/gateway-1.5.0.tar.gz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	libtool	4890219c51da247200223277f993e054	multilib	23ae8c186171e6476af098d2a50d0ee0	ssl-cert	b29ef3f715f3a76f1bf807b7e8751096	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	user	906f3c8eb3a2350a4f1191a89baa3e46
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	libtool	4890219c51da247200223277f993e054	multilib	23ae8c186171e6476af098d2a50d0ee0	ssl-cert	6f7d720c036362122b0bfb4461e56a11	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	user	906f3c8eb3a2350a4f1191a89baa3e46
 _md5_=5043544c90a8889afb52672dd5386f89
diff --git a/metadata/md5-cache/app-office/libreoffice-5.1.1.3 b/metadata/md5-cache/app-office/libreoffice-5.1.1.3
deleted file mode 100644
index 4e479f16e250..000000000000
--- a/metadata/md5-cache/app-office/libreoffice-5.1.1.3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads,xml] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads,xml] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads,xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] app-arch/zip app-arch/unzip >=app-text/hunspell-1.3.2-r3 app-text/mythes >=app-text/libabw-0.1.0 >=app-text/libexttextcat-3.4.4 >=app-text/libebook-0.1 >=app-text/libetonyek-0.1 app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.1 >=app-text/libodfgen-0.1.0 app-text/libwpd:0.10[tools] app-text/libwpg:0.3 >=app-text/libwps-0.4 >=app-text/poppler-0.16:=[cxx] >=dev-cpp/clucene-2.3.3.4-r2 =dev-cpp/libcmis-0.5* dev-db/unixODBC >=dev-libs/boost-1.55:= dev-libs/expat >=dev-libs/hyphen-2.7.1 >=dev-libs/icu-4.8.1.1:= =dev-libs/liborcus-0.9* >=dev-libs/librevenge-0.0.1 >=dev-libs/nspr-4.8.8 >=dev-libs/nss-3.12.9 >=dev-lang/perl-5.0 !libressl? ( >=dev-libs/openssl-1.0.0d:0 ) libressl? ( dev-libs/libressl ) >=dev-libs/redland-1.0.16 media-gfx/graphite2 >=media-libs/fontconfig-2.8.0 media-libs/freetype:2 >=media-libs/glew-1.10 >=media-libs/harfbuzz-0.9.18:=[icu(+)] media-libs/lcms:2 >=media-libs/libpng-1.4:0= >=media-libs/libcdr-0.1.0 >=media-libs/libfreehand-0.1.0 media-libs/libpagemaker >=media-libs/libvisio-0.1.0 >=net-misc/curl-7.21.4 net-libs/neon net-nds/openldap sci-mathematics/lpsolve virtual/jpeg:0 >=x11-libs/cairo-1.10.0[X,-xlib-xcb] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender virtual/glu virtual/opengl bluetooth? ( net-wireless/bluez ) coinmp? ( sci-libs/coinor-mp ) collada? ( >=media-libs/opencollada-1.2.2_p20150207 ) cups? ( net-print/cups ) dbus? ( >=dev-libs/dbus-glib-0.92 ) eds? ( dev-libs/glib:2 gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-2.5 ) gltf? ( media-libs/libgltf ) gtk? ( x11-libs/gdk-pixbuf[X] >=x11-libs/gtk+-2.24:2 ) gtk3? ( dev-libs/glib:2 dev-libs/gobject-introspection >=x11-libs/gtk+-3.8:3 ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) jemalloc? ( dev-libs/jemalloc ) libreoffice_extensions_scripting-beanshell? ( >=dev-java/bsh-2.0_beta4 ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) mysql? ( >=dev-db/mysql-connector-c++-1.1.0 ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) telepathy? ( >=net-libs/telepathy-glib-0.18.0 ) >=dev-libs/libatomic_ops-7.2d >=dev-libs/libxml2-2.7.8 dev-libs/libxslt dev-perl/Archive-Zip dev-util/cppunit >=dev-util/gperf-3 dev-util/intltool >=dev-util/mdds-0.12.0:0= media-libs/glm net-misc/npapi-sdk sys-devel/bison sys-devel/flex sys-devel/gettext !<sys-devel/make-3.82 sys-devel/ucpp sys-libs/zlib virtual/pkgconfig x11-libs/libXt x11-libs/libXtst x11-proto/randrproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto java? ( >=virtual/jdk-1.6 >=dev-java/ant-core-1.7 ) odk? ( >=app-doc/doxygen-1.8.4 ) test? ( dev-util/cppunit ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 java? ( >=dev-java/java-config-2.2.0 ) >=sys-apps/sed-4 kde? ( dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) ) kde? ( dev-lang/perl >=dev-qt/qt3support-4.7.4:4[accessibility] >=dev-qt/qtcore-4.7.4:4[qt3support,ssl] >=dev-qt/qtdbus-4.7.4:4 >=dev-qt/designer-4.7.4:4 >=dev-qt/qtgui-4.7.4:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.7.4:4 >=dev-qt/qtsql-4.7.4:4[qt3support] >=dev-qt/qtsvg-4.7.4:4 >=dev-qt/qttest-4.7.4:4 >=dev-qt/qtwebkit-4.7.4:4 >=kde-base/kdelibs-4.4:4[aqua=] )
-DESCRIPTION=A full office productivity suite
-EAPI=5
-HOMEPAGE=http://www.libreoffice.org
-IUSE=bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome gstreamer +gtk gtk3 jemalloc kde libressl mysql odk postgres telepathy test vlc libreoffice_extensions_nlpsolver libreoffice_extensions_scripting-beanshell libreoffice_extensions_scripting-javascript libreoffice_extensions_wiki-publisher elibc_FreeBSD java aqua kde python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5
-KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux
-LICENSE=|| ( LGPL-3 MPL-1.1 )
-PDEPEND==app-office/libreoffice-l10n-5.1*
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads,xml] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads,xml] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads,xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] app-arch/zip app-arch/unzip >=app-text/hunspell-1.3.2-r3 app-text/mythes >=app-text/libabw-0.1.0 >=app-text/libexttextcat-3.4.4 >=app-text/libebook-0.1 >=app-text/libetonyek-0.1 app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.1 >=app-text/libodfgen-0.1.0 app-text/libwpd:0.10[tools] app-text/libwpg:0.3 >=app-text/libwps-0.4 >=app-text/poppler-0.16:=[cxx] >=dev-cpp/clucene-2.3.3.4-r2 =dev-cpp/libcmis-0.5* dev-db/unixODBC >=dev-libs/boost-1.55:= dev-libs/expat >=dev-libs/hyphen-2.7.1 >=dev-libs/icu-4.8.1.1:= =dev-libs/liborcus-0.9* >=dev-libs/librevenge-0.0.1 >=dev-libs/nspr-4.8.8 >=dev-libs/nss-3.12.9 >=dev-lang/perl-5.0 !libressl? ( >=dev-libs/openssl-1.0.0d:0 ) libressl? ( dev-libs/libressl ) >=dev-libs/redland-1.0.16 media-gfx/graphite2 >=media-libs/fontconfig-2.8.0 media-libs/freetype:2 >=media-libs/glew-1.10 >=media-libs/harfbuzz-0.9.18:=[icu(+)] media-libs/lcms:2 >=media-libs/libpng-1.4:0= >=media-libs/libcdr-0.1.0 >=media-libs/libfreehand-0.1.0 media-libs/libpagemaker >=media-libs/libvisio-0.1.0 >=net-misc/curl-7.21.4 net-libs/neon net-nds/openldap sci-mathematics/lpsolve virtual/jpeg:0 >=x11-libs/cairo-1.10.0[X,-xlib-xcb] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender virtual/glu virtual/opengl bluetooth? ( net-wireless/bluez ) coinmp? ( sci-libs/coinor-mp ) collada? ( >=media-libs/opencollada-1.2.2_p20150207 ) cups? ( net-print/cups ) dbus? ( >=dev-libs/dbus-glib-0.92 ) eds? ( dev-libs/glib:2 gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-2.5 ) gltf? ( media-libs/libgltf ) gtk? ( x11-libs/gdk-pixbuf[X] >=x11-libs/gtk+-2.24:2 ) gtk3? ( dev-libs/glib:2 dev-libs/gobject-introspection >=x11-libs/gtk+-3.8:3 ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) jemalloc? ( dev-libs/jemalloc ) libreoffice_extensions_scripting-beanshell? ( >=dev-java/bsh-2.0_beta4 ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) mysql? ( >=dev-db/mysql-connector-c++-1.1.0 ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) telepathy? ( >=net-libs/telepathy-glib-0.18.0 ) !app-office/libreoffice-bin !app-office/libreoffice-bin-debug !<app-office/openoffice-bin-3.4.0-r1 !app-office/openoffice media-fonts/libertine media-fonts/liberation-fonts media-fonts/urw-fonts java? ( >=virtual/jre-1.6 ) kde? ( >=kde-apps/kioclient-4.4:4[aqua=] ) vlc? ( media-video/vlc ) java? ( >=dev-java/java-config-2.2.0 ) kde? ( kde-frameworks/oxygen-icons ) kde? ( dev-lang/perl >=dev-qt/qt3support-4.7.4:4[accessibility] >=dev-qt/qtcore-4.7.4:4[qt3support,ssl] >=dev-qt/qtdbus-4.7.4:4 >=dev-qt/designer-4.7.4:4 >=dev-qt/qtgui-4.7.4:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.7.4:4 >=dev-qt/qtsql-4.7.4:4[qt3support] >=dev-qt/qtsvg-4.7.4:4 >=dev-qt/qttest-4.7.4:4 >=dev-qt/qtwebkit-4.7.4:4 >=kde-base/kdelibs-4.4:4[aqua=] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) bluetooth? ( dbus ) collada? ( gltf ) eds? ( gnome ) gnome? ( gtk ) telepathy? ( gtk ) libreoffice_extensions_nlpsolver? ( java ) libreoffice_extensions_scripting-beanshell? ( java ) libreoffice_extensions_scripting-javascript? ( java ) libreoffice_extensions_wiki-publisher? ( java )
-SLOT=0
-SRC_URI=branding? ( http://dev.gentoo.org/~dilfridge/distfiles/libreoffice-branding-gentoo-0.8.tar.xz ) http://dev-builds.libreoffice.org/pre-releases/src/libreoffice-5.1.1.3.tar.xz http://dev-builds.libreoffice.org/pre-releases/src/libreoffice-help-5.1.1.3.tar.xz http://download.documentfoundation.org/libreoffice/src/5.1.1//libreoffice-5.1.1.3.tar.xz http://download.documentfoundation.org/libreoffice/src/5.1.1//libreoffice-help-5.1.1.3.tar.xz http://download.documentfoundation.org/libreoffice/old/5.1.1.3//libreoffice-5.1.1.3.tar.xz http://download.documentfoundation.org/libreoffice/old/5.1.1.3//libreoffice-help-5.1.1.3.tar.xz http://dev-www.libreoffice.org/src//d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz http://dev-www.libreoffice.org/src//1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz collada? ( http://dev-www.libreoffice.org/src//4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 ) java? ( http://dev-www.libreoffice.org/src//17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ) libreoffice_extensions_wiki-publisher? ( http://dev-www.libreoffice.org/src//a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip ) libreoffice_extensions_scripting-javascript? ( http://dev-www.libreoffice.org/src//798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip ) libreoffice_extensions_scripting-javascript? ( http://dev-www.libreoffice.org/src//35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ) odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	check-reqs	aee25bdf4e2f459af86d17f7c41dcdf6	eutils	9d81603248f2ba3ec59124320d123e5e	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	kde4-base	98acb5fdc583ece9b41bbe16d2a05585	kde4-functions	88bc45dff8c885002aca6e4c0adbe541	libtool	4890219c51da247200223277f993e054	multilib	23ae8c186171e6476af098d2a50d0ee0	multiprocessing	e32940a7b2a9992ad217eccddb84d548	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=cc2fec30e2e8248e8d0728cd973508cc
diff --git a/metadata/md5-cache/app-office/libreoffice-9999 b/metadata/md5-cache/app-office/libreoffice-9999
index 1ec52bb5cedc..db46c26b49ea 100644
--- a/metadata/md5-cache/app-office/libreoffice-9999
+++ b/metadata/md5-cache/app-office/libreoffice-9999
@@ -9,6 +9,6 @@ PDEPEND=!app-office/libreoffice-l10n
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads,xml] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads,xml] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads,xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] app-arch/zip app-arch/unzip >=app-text/hunspell-1.3.2-r3 app-text/mythes >=app-text/libabw-0.1.0 >=app-text/libexttextcat-3.4.4 >=app-text/libebook-0.1 >=app-text/libetonyek-0.1 app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.1 >=app-text/libodfgen-0.1.0 app-text/libwpd:0.10[tools] app-text/libwpg:0.3 >=app-text/libwps-0.4 >=app-text/poppler-0.16:=[cxx] >=dev-cpp/clucene-2.3.3.4-r2 =dev-cpp/libcmis-0.5* dev-db/unixODBC >=dev-libs/boost-1.55:= dev-libs/expat >=dev-libs/hyphen-2.7.1 >=dev-libs/icu-4.8.1.1:= >=dev-libs/liborcus-0.11.1 >=dev-libs/librevenge-0.0.1 >=dev-libs/nspr-4.8.8 >=dev-libs/nss-3.12.9 >=dev-lang/perl-5.0 !libressl? ( >=dev-libs/openssl-1.0.0d:0 ) libressl? ( dev-libs/libressl ) >=dev-libs/redland-1.0.16 media-gfx/graphite2 >=media-libs/fontconfig-2.8.0 media-libs/freetype:2 >=media-libs/glew-1.10 >=media-libs/harfbuzz-0.9.18:=[icu(+)] media-libs/lcms:2 >=media-libs/libpng-1.4:0= >=media-libs/libcdr-0.1.0 >=media-libs/libfreehand-0.1.0 media-libs/libpagemaker >=media-libs/libvisio-0.1.0 >=net-misc/curl-7.21.4 net-libs/neon net-nds/openldap sci-mathematics/lpsolve virtual/jpeg:0 >=x11-libs/cairo-1.10.0[X,-xlib-xcb] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender virtual/glu virtual/opengl bluetooth? ( net-wireless/bluez ) coinmp? ( sci-libs/coinor-mp ) collada? ( >=media-libs/opencollada-1.2.2_p20150207 ) cups? ( net-print/cups ) dbus? ( >=dev-libs/dbus-glib-0.92 ) eds? ( dev-libs/glib:2 gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-2.5 ) gltf? ( media-libs/libgltf ) gtk? ( x11-libs/gdk-pixbuf[X] >=x11-libs/gtk+-2.24:2 ) gtk3? ( dev-libs/glib:2 dev-libs/gobject-introspection >=x11-libs/gtk+-3.8:3 ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) jemalloc? ( dev-libs/jemalloc ) libreoffice_extensions_scripting-beanshell? ( >=dev-java/bsh-2.0_beta4 ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) mysql? ( >=dev-db/mysql-connector-c++-1.1.0 ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) telepathy? ( >=net-libs/telepathy-glib-0.18.0 ) !app-office/libreoffice-bin !app-office/libreoffice-bin-debug !<app-office/openoffice-bin-3.4.0-r1 !app-office/openoffice media-fonts/libertine media-fonts/liberation-fonts media-fonts/urw-fonts java? ( >=virtual/jre-1.6 ) kde? ( >=kde-apps/kioclient-4.4:4[aqua=] ) vlc? ( media-video/vlc ) java? ( >=dev-java/java-config-2.2.0 ) kde? ( kde-frameworks/oxygen-icons ) kde? ( dev-lang/perl >=dev-qt/qt3support-4.7.4:4[accessibility] >=dev-qt/qtcore-4.7.4:4[qt3support,ssl] >=dev-qt/qtdbus-4.7.4:4 >=dev-qt/designer-4.7.4:4 >=dev-qt/qtgui-4.7.4:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.7.4:4 >=dev-qt/qtsql-4.7.4:4[qt3support] >=dev-qt/qtsvg-4.7.4:4 >=dev-qt/qttest-4.7.4:4 >=dev-qt/qtwebkit-4.7.4:4 >=kde-base/kdelibs-4.4:4[aqua=] )
 REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) bluetooth? ( dbus ) collada? ( gltf ) eds? ( gnome ) gnome? ( gtk ) telepathy? ( gtk ) libreoffice_extensions_nlpsolver? ( java ) libreoffice_extensions_scripting-beanshell? ( java ) libreoffice_extensions_scripting-javascript? ( java ) libreoffice_extensions_wiki-publisher? ( java )
 SLOT=0
-SRC_URI=branding? ( http://dev.gentoo.org/~dilfridge/distfiles/libreoffice-branding-gentoo-0.8.tar.xz ) http://dev-www.libreoffice.org/src//fe664ba5f01ebfaeb0ab5deeb0b2249e-xmlsec1-1.2.19.tar.gz collada? ( http://dev-www.libreoffice.org/src//4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 ) java? ( http://dev-www.libreoffice.org/src//17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ) libreoffice_extensions_wiki-publisher? ( http://dev-www.libreoffice.org/src//a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip ) libreoffice_extensions_scripting-javascript? ( http://dev-www.libreoffice.org/src//798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip ) libreoffice_extensions_scripting-javascript? ( http://dev-www.libreoffice.org/src//35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ) odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )
+SRC_URI=branding? ( http://dev.gentoo.org/~dilfridge/distfiles/libreoffice-branding-gentoo-0.8.tar.xz ) http://dev-www.libreoffice.org/src//ce12af00283eb90d9281956524250d6e-xmlsec1-1.2.20.tar.gz collada? ( http://dev-www.libreoffice.org/src//4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 ) java? ( http://dev-www.libreoffice.org/src//17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ) libreoffice_extensions_wiki-publisher? ( http://dev-www.libreoffice.org/src//a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip ) libreoffice_extensions_scripting-javascript? ( http://dev-www.libreoffice.org/src//798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip ) libreoffice_extensions_scripting-javascript? ( http://dev-www.libreoffice.org/src//35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ) odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	check-reqs	aee25bdf4e2f459af86d17f7c41dcdf6	eutils	9d81603248f2ba3ec59124320d123e5e	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	d270fa247153df66074f795fa42dba3e	git-r3	ef66dfc3db09f327af21cf32f140fb2b	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	kde4-base	98acb5fdc583ece9b41bbe16d2a05585	kde4-functions	88bc45dff8c885002aca6e4c0adbe541	libtool	4890219c51da247200223277f993e054	multilib	23ae8c186171e6476af098d2a50d0ee0	multiprocessing	e32940a7b2a9992ad217eccddb84d548	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=6315027854667524f995b3c8908865e3
+_md5_=87038d1813a01148d44f5e1107638541
diff --git a/metadata/md5-cache/app-office/libreoffice-l10n-5.1.1.3 b/metadata/md5-cache/app-office/libreoffice-l10n-5.1.1.3
deleted file mode 100644
index 91a4d02fd73c..000000000000
--- a/metadata/md5-cache/app-office/libreoffice-l10n-5.1.1.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=>=app-arch/rpm2targz-9.0.0.3g
-DESCRIPTION=Translations for the Libreoffice suite
-EAPI=6
-HOMEPAGE=http://www.libreoffice.org
-IUSE=offlinehelp linguas_am linguas_ast linguas_bg linguas_bn_IN linguas_bn linguas_bo linguas_bs linguas_ca_valencia linguas_ca linguas_cs linguas_da linguas_de linguas_dz linguas_el linguas_en_GB linguas_en linguas_en_ZA linguas_eo linguas_es linguas_et linguas_eu linguas_fi linguas_fr linguas_gl linguas_gu linguas_he linguas_hi linguas_hr linguas_hu linguas_id linguas_is linguas_it linguas_ja linguas_ka linguas_km linguas_ko linguas_mk linguas_nb linguas_ne linguas_nl linguas_nn linguas_om linguas_pl linguas_pt_BR linguas_pt linguas_ru linguas_si linguas_sk linguas_sl linguas_sq linguas_sv linguas_tg linguas_tr linguas_ug linguas_uk linguas_vi linguas_zh_CN linguas_zh_TW linguas_af linguas_ar linguas_as linguas_be linguas_br linguas_brx linguas_cy linguas_dgo linguas_fa linguas_ga linguas_gd linguas_gug linguas_kk linguas_kmr_Latn linguas_kn linguas_kok linguas_ks linguas_lb linguas_lo linguas_lt linguas_lv linguas_mai linguas_ml linguas_mn linguas_mni linguas_mr linguas_my linguas_nr linguas_nso linguas_oc linguas_or linguas_pa_IN linguas_ro linguas_rw linguas_sa_IN linguas_sat linguas_sd linguas_sid linguas_sr_Latn linguas_sr linguas_ss linguas_st linguas_sw_TZ linguas_ta linguas_te linguas_th linguas_tn linguas_ts linguas_tt linguas_uz linguas_ve linguas_xh linguas_zu
-KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux
-LICENSE=|| ( LGPL-3 MPL-1.1 )
-RDEPEND=app-text/hunspell
-RESTRICT=strip
-SLOT=0
-SRC_URI=linguas_am? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_helppack_am.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_am.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_am.tar.gz ) ) linguas_ast? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_helppack_ast.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_ast.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_ast.tar.gz ) ) linguas_bg? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_helppack_bg.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_bg.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_bg.tar.gz ) ) linguas_bn_IN? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_helppack_bn-IN.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_bn-IN.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_bn-IN.tar.gz ) ) linguas_bn? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_helppack_bn.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_bn.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_bn.tar.gz ) ) linguas_bo? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_helppack_bo.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_bo.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_bo.tar.gz ) ) linguas_bs? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_helppack_bs.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_bs.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_bs.tar.gz ) ) linguas_ca_valencia? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_helppack_ca-valencia.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_ca-valencia.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_ca-valencia.tar.gz ) ) linguas_ca? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_helppack_ca.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_ca.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_ca.tar.gz ) ) linguas_cs? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_helppack_cs.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_cs.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_cs.tar.gz ) ) linguas_da? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_helppack_da.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_da.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_da.tar.gz ) ) linguas_de? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_helppack_de.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_de.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_de.tar.gz ) ) linguas_dz? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_helppack_dz.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_dz.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_dz.tar.gz ) ) linguas_el? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_helppack_el.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_el.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_el.tar.gz ) ) linguas_en_GB? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_helppack_en-GB.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_en-GB.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_en-GB.tar.gz ) ) linguas_en? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_helppack_en-US.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_en-US.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_en-US.tar.gz ) ) linguas_en_ZA? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_helppack_en-ZA.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_en-ZA.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_en-ZA.tar.gz ) ) linguas_eo? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_helppack_eo.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_eo.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_eo.tar.gz ) ) linguas_es? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_helppack_es.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_es.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_es.tar.gz ) ) linguas_et? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_helppack_et.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_et.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_et.tar.gz ) ) linguas_eu? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_helppack_eu.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_eu.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_eu.tar.gz ) ) linguas_fi? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_helppack_fi.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_fi.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_fi.tar.gz ) ) linguas_fr? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_helppack_fr.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_fr.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_fr.tar.gz ) ) linguas_gl? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_helppack_gl.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_gl.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_gl.tar.gz ) ) linguas_gu? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_helppack_gu.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_gu.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_gu.tar.gz ) ) linguas_he? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_helppack_he.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_he.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_he.tar.gz ) ) linguas_hi? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_helppack_hi.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_hi.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_hi.tar.gz ) ) linguas_hr? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_helppack_hr.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_hr.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_hr.tar.gz ) ) linguas_hu? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_helppack_hu.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_hu.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_hu.tar.gz ) ) linguas_id? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_helppack_id.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_id.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_id.tar.gz ) ) linguas_is? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_helppack_is.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_is.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_is.tar.gz ) ) linguas_it? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_helppack_it.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_it.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_it.tar.gz ) ) linguas_ja? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_helppack_ja.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_ja.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_ja.tar.gz ) ) linguas_ka? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_helppack_ka.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_ka.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_ka.tar.gz ) ) linguas_km? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_helppack_km.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_km.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_km.tar.gz ) ) linguas_ko? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_helppack_ko.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_ko.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_ko.tar.gz ) ) linguas_mk? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_helppack_mk.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_mk.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_mk.tar.gz ) ) linguas_nb? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_helppack_nb.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_nb.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_nb.tar.gz ) ) linguas_ne? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_helppack_ne.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_ne.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_ne.tar.gz ) ) linguas_nl? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_helppack_nl.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_nl.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_nl.tar.gz ) ) linguas_nn? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_helppack_nn.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_nn.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_nn.tar.gz ) ) linguas_om? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_helppack_om.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_om.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_om.tar.gz ) ) linguas_pl? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_helppack_pl.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_pl.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_pl.tar.gz ) ) linguas_pt_BR? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_helppack_pt-BR.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_pt-BR.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_pt-BR.tar.gz ) ) linguas_pt? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_helppack_pt.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_pt.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_pt.tar.gz ) ) linguas_ru? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_helppack_ru.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_ru.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_ru.tar.gz ) ) linguas_si? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_helppack_si.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_si.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_si.tar.gz ) ) linguas_sk? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_helppack_sk.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_sk.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_sk.tar.gz ) ) linguas_sl? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_helppack_sl.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_sl.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_sl.tar.gz ) ) linguas_sq? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_helppack_sq.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_sq.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_sq.tar.gz ) ) linguas_sv? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_helppack_sv.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_sv.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_sv.tar.gz ) ) linguas_tg? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_helppack_tg.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_tg.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_tg.tar.gz ) ) linguas_tr? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_helppack_tr.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_tr.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_tr.tar.gz ) ) linguas_ug? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_helppack_ug.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_ug.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_ug.tar.gz ) ) linguas_uk? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_helppack_uk.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_uk.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_uk.tar.gz ) ) linguas_vi? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_helppack_vi.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_vi.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_vi.tar.gz ) ) linguas_zh_CN? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_helppack_zh-CN.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_zh-CN.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_zh-CN.tar.gz ) ) linguas_zh_TW? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_helppack_zh-TW.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_zh-TW.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_zh-TW.tar.gz ) ) linguas_am? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_langpack_am.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_am.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_am.tar.gz ) linguas_ast? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_langpack_ast.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_ast.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_ast.tar.gz ) linguas_bg? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_langpack_bg.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_bg.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_bg.tar.gz ) linguas_bn_IN? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_langpack_bn-IN.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_bn-IN.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_bn-IN.tar.gz ) linguas_bn? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_langpack_bn.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_bn.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_bn.tar.gz ) linguas_bo? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_langpack_bo.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_bo.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_bo.tar.gz ) linguas_bs? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_langpack_bs.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_bs.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_bs.tar.gz ) linguas_ca_valencia? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_langpack_ca-valencia.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_ca-valencia.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_ca-valencia.tar.gz ) linguas_ca? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_langpack_ca.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_ca.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_ca.tar.gz ) linguas_cs? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_langpack_cs.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_cs.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_cs.tar.gz ) linguas_da? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_langpack_da.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_da.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_da.tar.gz ) linguas_de? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_langpack_de.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_de.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_de.tar.gz ) linguas_dz? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_langpack_dz.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_dz.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_dz.tar.gz ) linguas_el? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_langpack_el.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_el.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_el.tar.gz ) linguas_en_GB? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_langpack_en-GB.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_en-GB.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_en-GB.tar.gz ) linguas_en_ZA? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_langpack_en-ZA.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_en-ZA.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_en-ZA.tar.gz ) linguas_eo? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_langpack_eo.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_eo.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_eo.tar.gz ) linguas_es? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_langpack_es.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_es.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_es.tar.gz ) linguas_et? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_langpack_et.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_et.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_et.tar.gz ) linguas_eu? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_langpack_eu.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_eu.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_eu.tar.gz ) linguas_fi? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_langpack_fi.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_fi.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_fi.tar.gz ) linguas_fr? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_langpack_fr.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_fr.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_fr.tar.gz ) linguas_gl? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_langpack_gl.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_gl.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_gl.tar.gz ) linguas_gu? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_langpack_gu.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_gu.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_gu.tar.gz ) linguas_he? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_langpack_he.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_he.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_he.tar.gz ) linguas_hi? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_langpack_hi.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_hi.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_hi.tar.gz ) linguas_hr? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_langpack_hr.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_hr.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_hr.tar.gz ) linguas_hu? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_langpack_hu.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_hu.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_hu.tar.gz ) linguas_id? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_langpack_id.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_id.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_id.tar.gz ) linguas_is? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_langpack_is.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_is.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_is.tar.gz ) linguas_it? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_langpack_it.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_it.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_it.tar.gz ) linguas_ja? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_langpack_ja.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_ja.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_ja.tar.gz ) linguas_ka? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_langpack_ka.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_ka.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_ka.tar.gz ) linguas_km? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_langpack_km.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_km.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_km.tar.gz ) linguas_ko? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_langpack_ko.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_ko.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_ko.tar.gz ) linguas_mk? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_langpack_mk.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_mk.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_mk.tar.gz ) linguas_nb? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_langpack_nb.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_nb.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_nb.tar.gz ) linguas_ne? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_langpack_ne.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_ne.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_ne.tar.gz ) linguas_nl? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_langpack_nl.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_nl.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_nl.tar.gz ) linguas_nn? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_langpack_nn.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_nn.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_nn.tar.gz ) linguas_om? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_langpack_om.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_om.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_om.tar.gz ) linguas_pl? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_langpack_pl.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_pl.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_pl.tar.gz ) linguas_pt_BR? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_langpack_pt-BR.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_pt-BR.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_pt-BR.tar.gz ) linguas_pt? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_langpack_pt.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_pt.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_pt.tar.gz ) linguas_ru? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_langpack_ru.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_ru.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_ru.tar.gz ) linguas_si? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_langpack_si.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_si.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_si.tar.gz ) linguas_sk? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_langpack_sk.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_sk.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_sk.tar.gz ) linguas_sl? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_langpack_sl.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_sl.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_sl.tar.gz ) linguas_sq? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_langpack_sq.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_sq.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_sq.tar.gz ) linguas_sv? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_langpack_sv.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_sv.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_sv.tar.gz ) linguas_tg? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_langpack_tg.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_tg.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_tg.tar.gz ) linguas_tr? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_langpack_tr.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_tr.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_tr.tar.gz ) linguas_ug? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_langpack_ug.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_ug.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_ug.tar.gz ) linguas_uk? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_langpack_uk.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_uk.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_uk.tar.gz ) linguas_vi? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_langpack_vi.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_vi.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_vi.tar.gz ) linguas_zh_CN? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_langpack_zh-CN.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_zh-CN.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_zh-CN.tar.gz ) linguas_zh_TW? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_langpack_zh-TW.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_zh-TW.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_zh-TW.tar.gz ) linguas_af? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_langpack_af.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_af.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_af.tar.gz ) linguas_ar? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_langpack_ar.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_ar.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_ar.tar.gz ) linguas_as? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_langpack_as.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_as.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_as.tar.gz ) linguas_be? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_langpack_be.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_be.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_be.tar.gz ) linguas_br? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_langpack_br.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_br.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_br.tar.gz ) linguas_brx? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_langpack_brx.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_brx.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_brx.tar.gz ) linguas_cy? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_langpack_cy.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_cy.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_cy.tar.gz ) linguas_dgo? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_langpack_dgo.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_dgo.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_dgo.tar.gz ) linguas_fa? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_langpack_fa.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_fa.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_fa.tar.gz ) linguas_ga? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_langpack_ga.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_ga.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_ga.tar.gz ) linguas_gd? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_langpack_gd.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_gd.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_gd.tar.gz ) linguas_gug? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_langpack_gug.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_gug.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_gug.tar.gz ) linguas_kk? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_langpack_kk.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_kk.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_kk.tar.gz ) linguas_kmr_Latn? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_langpack_kmr-Latn.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_kmr-Latn.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_kmr-Latn.tar.gz ) linguas_kn? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_langpack_kn.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_kn.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_kn.tar.gz ) linguas_kok? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_langpack_kok.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_kok.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_kok.tar.gz ) linguas_ks? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_langpack_ks.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_ks.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_ks.tar.gz ) linguas_lb? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_langpack_lb.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_lb.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_lb.tar.gz ) linguas_lo? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_langpack_lo.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_lo.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_lo.tar.gz ) linguas_lt? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_langpack_lt.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_lt.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_lt.tar.gz ) linguas_lv? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_langpack_lv.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_lv.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_lv.tar.gz ) linguas_mai? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_langpack_mai.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_mai.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_mai.tar.gz ) linguas_ml? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_langpack_ml.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_ml.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_ml.tar.gz ) linguas_mn? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_langpack_mn.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_mn.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_mn.tar.gz ) linguas_mni? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_langpack_mni.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_mni.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_mni.tar.gz ) linguas_mr? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_langpack_mr.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_mr.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_mr.tar.gz ) linguas_my? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_langpack_my.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_my.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_my.tar.gz ) linguas_nr? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_langpack_nr.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_nr.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_nr.tar.gz ) linguas_nso? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_langpack_nso.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_nso.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_nso.tar.gz ) linguas_oc? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_langpack_oc.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_oc.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_oc.tar.gz ) linguas_or? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_langpack_or.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_or.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_or.tar.gz ) linguas_pa_IN? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_langpack_pa-IN.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_pa-IN.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_pa-IN.tar.gz ) linguas_ro? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_langpack_ro.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_ro.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_ro.tar.gz ) linguas_rw? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_langpack_rw.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_rw.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_rw.tar.gz ) linguas_sa_IN? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_langpack_sa-IN.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_sa-IN.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_sa-IN.tar.gz ) linguas_sat? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_langpack_sat.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_sat.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_sat.tar.gz ) linguas_sd? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_langpack_sd.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_sd.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_sd.tar.gz ) linguas_sid? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_langpack_sid.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_sid.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_sid.tar.gz ) linguas_sr_Latn? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_langpack_sr-Latn.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_sr-Latn.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_sr-Latn.tar.gz ) linguas_sr? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_langpack_sr.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_sr.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_sr.tar.gz ) linguas_ss? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_langpack_ss.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_ss.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_ss.tar.gz ) linguas_st? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_langpack_st.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_st.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_st.tar.gz ) linguas_sw_TZ? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_langpack_sw-TZ.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_sw-TZ.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_sw-TZ.tar.gz ) linguas_ta? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_langpack_ta.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_ta.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_ta.tar.gz ) linguas_te? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_langpack_te.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_te.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_te.tar.gz ) linguas_th? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_langpack_th.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_th.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_th.tar.gz ) linguas_tn? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_langpack_tn.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_tn.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_tn.tar.gz ) linguas_ts? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_langpack_ts.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_ts.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_ts.tar.gz ) linguas_tt? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_langpack_tt.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_tt.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_tt.tar.gz ) linguas_uz? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_langpack_uz.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_uz.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_uz.tar.gz ) linguas_ve? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_langpack_ve.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_ve.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_ve.tar.gz ) linguas_xh? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_langpack_xh.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_xh.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_xh.tar.gz ) linguas_zu? ( http://download.documentfoundation.org/libreoffice/stable/5.1.1/rpm/x86/LibreOffice_5.1.1_Linux_x86_rpm_langpack_zu.tar.gz -> LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_zu.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.1/rpm/x86/LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_zu.tar.gz )
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	multilib	23ae8c186171e6476af098d2a50d0ee0	rpm	3e120fdd74b358f9fb42b825a6558f61	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=797c64138ba8183f8c81aa5766b5d167
diff --git a/metadata/md5-cache/app-portage/portage-utils-0.63 b/metadata/md5-cache/app-portage/portage-utils-0.63
index f78a83ee0e23..086a82d58126 100644
--- a/metadata/md5-cache/app-portage/portage-utils-0.63
+++ b/metadata/md5-cache/app-portage/portage-utils-0.63
@@ -10,4 +10,4 @@ RDEPEND=dev-libs/iniparser:0
 SLOT=0
 SRC_URI=mirror://gentoo/portage-utils-0.63.tar.xz https://dev.gentoo.org/~vapier/dist/portage-utils-0.63.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb
-_md5_=8a4e5f36ca52169206309ab259b43cbe
+_md5_=f93ba0d7414eae99ee148223c878d4a3
diff --git a/metadata/md5-cache/app-text/blogc-0.8.0 b/metadata/md5-cache/app-text/blogc-0.8.1
similarity index 78%
rename from metadata/md5-cache/app-text/blogc-0.8.0
rename to metadata/md5-cache/app-text/blogc-0.8.1
index 8a7b641899f6..e1a28805b07f 100644
--- a/metadata/md5-cache/app-text/blogc-0.8.0
+++ b/metadata/md5-cache/app-text/blogc-0.8.1
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=>=dev-libs/squareball-0.2.0
 SLOT=0
-SRC_URI=https://github.com/blogc/blogc/releases/download/v0.8.0/blogc-0.8.0.tar.xz
+SRC_URI=https://github.com/blogc/blogc/releases/download/v0.8.1/blogc-0.8.1.tar.xz
 _md5_=16312feec5a95ac4ae1029b67c9bf6fc
diff --git a/metadata/md5-cache/app-text/libabw-0.1.1 b/metadata/md5-cache/app-text/libabw-0.1.1
index 8fb5ff10c0b4..7e3b9f77be25 100644
--- a/metadata/md5-cache/app-text/libabw-0.1.1
+++ b/metadata/md5-cache/app-text/libabw-0.1.1
@@ -1,7 +1,7 @@
-DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=dev-libs/librevenge dev-libs/libxml2 sys-libs/zlib >=dev-libs/boost-1.46 sys-devel/libtool virtual/pkgconfig doc? ( app-doc/doxygen )
+DEFINED_PHASES=configure install prepare
+DEPEND=dev-libs/librevenge dev-libs/libxml2 sys-libs/zlib >=dev-libs/boost-1.46 sys-devel/libtool virtual/pkgconfig doc? ( app-doc/doxygen ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Library parsing abiword documents
-EAPI=5
+EAPI=6
 HOMEPAGE=https://wiki.documentfoundation.org/DLP/Libraries/libabw
 IUSE=doc static-libs
 KEYWORDS=amd64 ~arm x86
@@ -9,5 +9,5 @@ LICENSE=MPL-2.0
 RDEPEND=dev-libs/librevenge dev-libs/libxml2 sys-libs/zlib
 SLOT=0
 SRC_URI=http://dev-www.libreoffice.org/src/libabw/libabw-0.1.1.tar.xz
-_eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	9d81603248f2ba3ec59124320d123e5e	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb
-_md5_=583d47db661b20fb86bfbedb49eace59
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	libtool	4890219c51da247200223277f993e054	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb
+_md5_=5ef4c64dfb693e61a0e625ced1d2ec12
diff --git a/metadata/md5-cache/dev-cpp/glibmm-2.46.1 b/metadata/md5-cache/dev-cpp/glibmm-2.46.1
deleted file mode 100644
index e5984d4c10b2..000000000000
--- a/metadata/md5-cache/dev-cpp/glibmm-2.46.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DEPEND=>=dev-libs/libsigc++-2.6.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.46.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/pkgconfig doc? ( app-doc/doxygen ) app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=C++ interface for glib2
-EAPI=5
-HOMEPAGE=http://www.gtkmm.org
-IUSE=doc debug examples test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
-LICENSE=LGPL-2.1+ GPL-2+
-RDEPEND=>=dev-libs/libsigc++-2.6.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.46.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-SLOT=2
-SRC_URI=mirror://gnome/sources/glibmm/2.46/glibmm-2.46.1.tar.xz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	21c81ea94c12e45a63f7f14fba666e3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	23ae8c186171e6476af098d2a50d0ee0	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=2aa3570d1dc598a259f64d853fa03569
diff --git a/metadata/md5-cache/dev-cpp/glibmm-2.46.2 b/metadata/md5-cache/dev-cpp/glibmm-2.46.4
similarity index 95%
rename from metadata/md5-cache/dev-cpp/glibmm-2.46.2
rename to metadata/md5-cache/dev-cpp/glibmm-2.46.4
index 094a291ad2c8..ddfdb1d45dcb 100644
--- a/metadata/md5-cache/dev-cpp/glibmm-2.46.2
+++ b/metadata/md5-cache/dev-cpp/glibmm-2.46.4
@@ -8,6 +8,6 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-f
 LICENSE=LGPL-2.1+ GPL-2+
 RDEPEND=>=dev-libs/libsigc++-2.6.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.46.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=2
-SRC_URI=mirror://gnome/sources/glibmm/2.46/glibmm-2.46.2.tar.xz
+SRC_URI=mirror://gnome/sources/glibmm/2.46/glibmm-2.46.4.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	21c81ea94c12e45a63f7f14fba666e3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	23ae8c186171e6476af098d2a50d0ee0	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=ac9052790fb9caa9288a751d7dc6611b
+_md5_=8ae15dcfb39970b332d8ebca612eac85
diff --git a/metadata/md5-cache/dev-cpp/gtkmm-3.18.1 b/metadata/md5-cache/dev-cpp/gtkmm-3.18.1
new file mode 100644
index 000000000000..47a3dbb5a37a
--- /dev/null
+++ b/metadata/md5-cache/dev-cpp/gtkmm-3.18.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
+DEPEND=>=dev-cpp/glibmm-2.46.1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/gtk+-3.18.0:3[aqua?,wayland?,X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/gdk-pixbuf-2.28:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-cpp/atkmm-2.24.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-cpp/cairomm-1.12.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-cpp/pangomm-2.38.1:1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libsigc++-2.3.2:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/pkgconfig examples? ( >=media-libs/libepoxy-1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) doc? ( media-gfx/graphviz dev-libs/libxslt app-doc/doxygen ) app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=C++ interface for GTK+
+EAPI=5
+HOMEPAGE=http://www.gtkmm.org
+IUSE=aqua doc examples test wayland X abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-cpp/glibmm-2.46.1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/gtk+-3.18.0:3[aqua?,wayland?,X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/gdk-pixbuf-2.28:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-cpp/atkmm-2.24.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-cpp/cairomm-1.12.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-cpp/pangomm-2.38.1:1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libsigc++-2.3.2:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+REQUIRED_USE=|| ( aqua wayland X )
+SLOT=3.0
+SRC_URI=mirror://gnome/sources/gtkmm/3.18/gtkmm-3.18.1.tar.xz
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	21c81ea94c12e45a63f7f14fba666e3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	23ae8c186171e6476af098d2a50d0ee0	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=5accbea757ad946366df564723f9edd1
diff --git a/metadata/md5-cache/dev-db/mycli-1.6.0 b/metadata/md5-cache/dev-db/mycli-1.6.0
new file mode 100644
index 000000000000..540232e8b0a8
--- /dev/null
+++ b/metadata/md5-cache/dev-db/mycli-1.6.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
+DESCRIPTION=CLI for MySQL Database with auto-completion and syntax highlighting
+EAPI=5
+HOMEPAGE=http://mycli.net
+IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD MIT
+RDEPEND=>=dev-python/click-4.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/configobj-5.0.6[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] =dev-python/prompt_toolkit-0.60[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/pycrypto-2.6.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/pygments-2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/pymysql-0.6.6[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/python-sqlparse-0.1.16[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
+SLOT=0
+SRC_URI=https://github.com/dbcli/mycli/archive/v1.6.0.tar.gz -> mycli-1.6.0.tar.gz
+_eclasses_=distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	eutils	9d81603248f2ba3ec59124320d123e5e	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	23ae8c186171e6476af098d2a50d0ee0	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	d513d423d449877e49d99af3f7af7acb
+_md5_=2db6acb3c5c87a5f1b4ed49082f99b88
diff --git a/metadata/md5-cache/dev-db/rqlite-1.0 b/metadata/md5-cache/dev-db/rqlite-1.0
deleted file mode 100644
index ccd710658759..000000000000
--- a/metadata/md5-cache/dev-db/rqlite-1.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.4.2:=
-DESCRIPTION=Replicated SQLite using the Raft consensus protocol
-EAPI=5
-HOMEPAGE=https://github.com/otoolep/rqlite http://www.philipotoole.com/replicating-sqlite-using-raft-consensus
-KEYWORDS=~amd64
-LICENSE=MIT
-RESTRICT=test
-SLOT=0/1.0
-SRC_URI=https://github.com/otoolep/rqlite/archive/v1.0.tar.gz -> rqlite-1.0.tar.gz https://github.com/gorilla/mux/archive/26a6070f849969ba72b72256e9f14cf519751690.tar.gz -> gorilla-mux-26a6070f849969ba72b72256e9f14cf519751690.tar.gz https://github.com/gorilla/context/archive/1c83b3eabd45b6d76072b66b746c20815fb2872d.tar.gz -> gorilla-context-1c83b3eabd45b6d76072b66b746c20815fb2872d.tar.gz https://github.com/otoolep/raft/archive/75a23dbefaeea0be2869de087c2cd3379e84c424.tar.gz -> go-raft-75a23dbefaeea0be2869de087c2cd3379e84c424.tar.gz https://github.com/golang/protobuf/archive/68c687dc49948540b356a6b47931c9be4fcd0245.tar.gz -> go-protobuf-0_pre20150809.tar.gz https://github.com/rcrowley/go-metrics/archive/51425a2415d21afadfd55cd93432c0bc69e9598d.tar.gz -> go-metrics-51425a2415d21afadfd55cd93432c0bc69e9598d.tar.gz https://github.com/mattn/go-sqlite3/archive/c5aee9649735e8dadac55eb968ccebd9fa29a881.tar.gz -> go-sqlite3-1.1.0_p20160131.tar.gz
-_eclasses_=golang-base	08fe6e0e2b4750daff8887a7f0e1f873	golang-build	a44f10e6bd86ecccf2a07cc0d4cf6bec
-_md5_=833de82843222b7011393d6aaccbe2c0
diff --git a/metadata/md5-cache/dev-db/rqlite-2.0_pre20160308 b/metadata/md5-cache/dev-db/rqlite-2.0_pre20160308
deleted file mode 100644
index deda57bc4182..000000000000
--- a/metadata/md5-cache/dev-db/rqlite-2.0_pre20160308
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.4.2:=
-DESCRIPTION=Replicated SQLite using the Raft consensus protocol
-EAPI=5
-HOMEPAGE=https://github.com/otoolep/rqlite http://www.philipotoole.com/replicating-sqlite-using-raft-consensus
-KEYWORDS=~amd64
-LICENSE=MIT
-RESTRICT=test
-SLOT=0/2.0_pre20160308
-SRC_URI=https://github.com/otoolep/rqlite/archive/f65218201d46804e52459301b1e6c8a3af2c21ad.tar.gz -> rqlite-2.0_pre20160308.tar.gz https://github.com/armon/go-metrics/archive/345426c77237ece5dab0e1605c3e4b35c3f54757.tar.gz -> go-metrics-345426c77237ece5dab0e1605c3e4b35c3f54757.tar.gz https://github.com/boltdb/bolt/archive/2f846c3551b76d7710f159be840d66c3d064abbe.tar.gz -> bolt-2f846c3551b76d7710f159be840d66c3d064abbe.tar.gz https://github.com/hashicorp/go-msgpack/archive/fa3f63826f7c23912c15263591e65d54d080b458.tar.gz -> go-msgpack-fa3f63826f7c23912c15263591e65d54d080b458.tar.gz https://github.com/hashicorp/raft/archive/057b893fd996696719e98b6c44649ea14968c811.tar.gz -> hashicorp-raft-057b893fd996696719e98b6c44649ea14968c811.tar.gz https://github.com/hashicorp/raft-boltdb/archive/d1e82c1ec3f15ee991f7cc7ffd5b67ff6f5bbaee.tar.gz -> hashicorp-boltdb-d1e82c1ec3f15ee991f7cc7ffd5b67ff6f5bbaee.tar.gz https://github.com/mattn/go-sqlite3/archive/10876d7dac65f02064c03d7372a2f1dfb90043fe.tar.gz -> go-sqlite3-1.1.0_p20160307.tar.gz
-_eclasses_=golang-base	08fe6e0e2b4750daff8887a7f0e1f873	golang-build	a44f10e6bd86ecccf2a07cc0d4cf6bec
-_md5_=7781dc8304fd6ea1e14de8071a3253fa
diff --git a/metadata/md5-cache/dev-games/crystalspace-2.0-r1 b/metadata/md5-cache/dev-games/crystalspace-2.0-r1
index e4ba01fdb929..585afcf4cdd4 100644
--- a/metadata/md5-cache/dev-games/crystalspace-2.0-r1
+++ b/metadata/md5-cache/dev-games/crystalspace-2.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup
-DEPEND=virtual/opengl media-libs/openal x11-libs/libXt x11-libs/libXxf86vm sys-libs/zlib cg? ( media-gfx/nvidia-cg-toolkit ) ode? ( <dev-games/ode-0.12 ) cal3d? ( >=media-libs/cal3d-0.11 ) jpeg? ( virtual/jpeg:0 ) bullet? ( sci-physics/bullet ) vorbis? ( media-libs/libvorbis ) speex? ( media-libs/libogg media-libs/speex ) truetype? ( >=media-libs/freetype-2.1 ) alsa? ( media-libs/alsa-lib ) mng? ( media-libs/libmng ) png? ( media-libs/libpng:0 ) wxwidgets? ( x11-libs/wxGTK:3.0[X,opengl] ) cegui? ( >=dev-games/cegui-0.5.0 ) 3ds? ( media-libs/lib3ds ) java? ( >=virtual/jdk-1.5 dev-java/ant-core ) dev-util/ftjam dev-lang/swig virtual/pkgconfig java? ( >=dev-java/java-config-2.2.0 ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=virtual/opengl media-libs/openal x11-libs/libXt x11-libs/libXxf86vm sys-libs/zlib cg? ( media-gfx/nvidia-cg-toolkit ) ode? ( <dev-games/ode-0.12 ) cal3d? ( >=media-libs/cal3d-0.11 ) jpeg? ( virtual/jpeg:0 ) bullet? ( sci-physics/bullet ) vorbis? ( media-libs/libvorbis ) speex? ( media-libs/libogg media-libs/speex ) truetype? ( >=media-libs/freetype-2.1 ) alsa? ( media-libs/alsa-lib ) mng? ( media-libs/libmng ) png? ( media-libs/libpng:0 ) wxwidgets? ( x11-libs/wxGTK:3.0[X,opengl] ) cegui? ( >=dev-games/cegui-0.5.0 ) 3ds? ( media-libs/lib3ds ) java? ( >=virtual/jdk-1.5 dev-java/ant-core ) dev-util/ftjam <dev-lang/swig-3 virtual/pkgconfig java? ( >=dev-java/java-config-2.2.0 ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Portable 3D Game Development Kit written in C++
 EAPI=5
 HOMEPAGE=http://crystal.sourceforge.net/
@@ -10,4 +10,4 @@ RDEPEND=virtual/opengl media-libs/openal x11-libs/libXt x11-libs/libXxf86vm sys-
 SLOT=0
 SRC_URI=mirror://sourceforge/crystal/crystalspace-src-2.0.tar.bz2
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	libtool	4890219c51da247200223277f993e054	multilib	23ae8c186171e6476af098d2a50d0ee0	multiprocessing	e32940a7b2a9992ad217eccddb84d548	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	wxwidgets	9b34ce3ca77f4e418e8fd9951c4c1cb1
-_md5_=663ed4292dc672abf666295378e4736c
+_md5_=a8011d8954b4150186841a3e993eca3c
diff --git a/metadata/md5-cache/dev-java/jupidator-0.6.0-r1 b/metadata/md5-cache/dev-java/jupidator-0.6.0-r1
new file mode 100644
index 000000000000..dab4dca3e79a
--- /dev/null
+++ b/metadata/md5-cache/dev-java/jupidator-0.6.0-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install preinst prepare setup
+DEPEND=>=virtual/jdk-1.6 source? ( app-arch/zip ) >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
+DESCRIPTION=Jupidator is a library/tool in Java for automatic updating of applications
+EAPI=5
+HOMEPAGE=http://www.sourceforge.net/projects/jupidator
+IUSE=elibc_FreeBSD doc source elibc_FreeBSD
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-3
+RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
+SLOT=0
+SRC_URI=mirror://sourceforge/jupidator/jupidator.0.6.0.tar.bz2 -> jupidator-0.6.0.tar.bz2
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=04b9b868e4614fa3ae9db4218fc90d39
diff --git a/metadata/md5-cache/dev-python/flask-sqlalchemy-0.16-r1 b/metadata/md5-cache/dev-python/flask-sqlalchemy-0.16-r1
deleted file mode 100644
index 2ad9fb320209..000000000000
--- a/metadata/md5-cache/dev-python/flask-sqlalchemy-0.16-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/flask[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/sqlalchemy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=SQLAlchemy support for Flask applications
-EAPI=5
-HOMEPAGE=https://pypi.python.org/pypi/Flask-SQLAlchemy
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-python/flask[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/sqlalchemy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://pypi/F/Flask-SQLAlchemy/Flask-SQLAlchemy-0.16.tar.gz
-_eclasses_=distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	eutils	9d81603248f2ba3ec59124320d123e5e	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	23ae8c186171e6476af098d2a50d0ee0	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	d513d423d449877e49d99af3f7af7acb
-_md5_=85c3e7f6131706d39fc5a8e9f754c7c3
diff --git a/metadata/md5-cache/dev-python/flask-sqlalchemy-2.1 b/metadata/md5-cache/dev-python/flask-sqlalchemy-2.1
index e0c60603369e..15cf3fdd024c 100644
--- a/metadata/md5-cache/dev-python/flask-sqlalchemy-2.1
+++ b/metadata/md5-cache/dev-python/flask-sqlalchemy-2.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/flask-0.10[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/sqlalchemy[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] doc? ( dev-python/sphinx[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) python_targets_pypy? ( virtual/pypy:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
+DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/flask-0.10[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/sqlalchemy[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] doc? ( dev-python/sphinx[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_pypy? ( virtual/pypy:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 DESCRIPTION=SQLAlchemy support for Flask applications
-EAPI=5
+EAPI=6
 HOMEPAGE=https://pypi.python.org/pypi/Flask-SQLAlchemy
-IUSE=doc python_targets_pypy python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
+IUSE=doc python_targets_pypy python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
-RDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/flask-0.10[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/sqlalchemy[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_pypy? ( virtual/pypy:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
+RDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/flask-0.10[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/sqlalchemy[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_pypy? ( virtual/pypy:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/F/Flask-SQLAlchemy/Flask-SQLAlchemy-2.1.tar.gz
-_eclasses_=distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	eutils	9d81603248f2ba3ec59124320d123e5e	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	23ae8c186171e6476af098d2a50d0ee0	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	d513d423d449877e49d99af3f7af7acb
-_md5_=bc4d7857f72d6bd7b8eee8b0f649a752
+_eclasses_=distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	23ae8c186171e6476af098d2a50d0ee0	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	d513d423d449877e49d99af3f7af7acb
+_md5_=9dbb252a696925dcc7392cfbe6af8d2b
diff --git a/metadata/md5-cache/dev-python/pymediainfo-2.0 b/metadata/md5-cache/dev-python/pymediainfo-2.0
deleted file mode 100644
index 9f6dd2ef181e..000000000000
--- a/metadata/md5-cache/dev-python/pymediainfo-2.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] test? ( media-video/mediainfo dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=A wrapper around the mediainfo command
-EAPI=5
-HOMEPAGE=https://github.com/sbraz/pymediainfo
-IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=media-video/mediainfo python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=mirror://pypi/p/pymediainfo/pymediainfo-2.0.tar.gz
-_eclasses_=distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	eutils	9d81603248f2ba3ec59124320d123e5e	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	23ae8c186171e6476af098d2a50d0ee0	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	d513d423d449877e49d99af3f7af7acb
-_md5_=919c9fad8194b49e2a5917ff6724348a
diff --git a/metadata/md5-cache/dev-python/pymediainfo-2.1 b/metadata/md5-cache/dev-python/pymediainfo-2.1
new file mode 100644
index 000000000000..2b3a2f554815
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pymediainfo-2.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] test? ( media-libs/libmediainfo dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DESCRIPTION=A wrapper around the mediainfo library
+EAPI=6
+HOMEPAGE=https://github.com/sbraz/pymediainfo
+IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=media-libs/libmediainfo python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 )
+SLOT=0
+SRC_URI=mirror://pypi/p/pymediainfo/pymediainfo-2.1.tar.gz
+_eclasses_=distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	23ae8c186171e6476af098d2a50d0ee0	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	d513d423d449877e49d99af3f7af7acb
+_md5_=bf212eb70a4cd08accb498d34c9c6ce9
diff --git a/metadata/md5-cache/dev-python/sip-4.18 b/metadata/md5-cache/dev-python/sip-4.18
new file mode 100644
index 000000000000..2ab420a22abc
--- /dev/null
+++ b/metadata/md5-cache/dev-python/sip-4.18
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DESCRIPTION=Python extension module generator for C and C++ libraries
+EAPI=6
+HOMEPAGE=http://www.riverbankcomputing.com/software/sip/intro https://pypi.python.org/pypi/SIP
+IUSE=debug doc python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=|| ( GPL-2 GPL-3 SIP )
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 )
+SLOT=0/11
+SRC_URI=mirror://sourceforge/pyqt/sip-4.18.tar.gz
+_eclasses_=multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	23ae8c186171e6476af098d2a50d0ee0	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	d513d423d449877e49d99af3f7af7acb
+_md5_=a85b69bb0d5341e8fa30af9280ef8169
diff --git a/metadata/md5-cache/dev-python/sip-4.9999 b/metadata/md5-cache/dev-python/sip-4.9999
index f22909ad60df..bb94b446b559 100644
--- a/metadata/md5-cache/dev-python/sip-4.9999
+++ b/metadata/md5-cache/dev-python/sip-4.9999
@@ -1,7 +1,7 @@
 DEFINED_PHASES=compile configure install prepare unpack
 DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] sys-devel/bison sys-devel/flex doc? ( dev-python/sphinx[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-vcs/mercurial
 DESCRIPTION=Python extension module generator for C and C++ libraries
-EAPI=5
+EAPI=6
 HOMEPAGE=http://www.riverbankcomputing.com/software/sip/intro https://pypi.python.org/pypi/SIP
 IUSE=debug doc python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5
 LICENSE=|| ( GPL-2 GPL-3 SIP )
@@ -9,4 +9,4 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targ
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 ) || ( python_targets_python2_7 )
 SLOT=0/11
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	mercurial	789038b352d112bcff9dff083aa40d8d	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	23ae8c186171e6476af098d2a50d0ee0	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	d513d423d449877e49d99af3f7af7acb
-_md5_=011130d84eabe1fbef1e2188b25f6ebe
+_md5_=3b6459aceecc19f5d4e9e1ada653c001
diff --git a/metadata/md5-cache/dev-ruby/activesupport-4.2.6-r1 b/metadata/md5-cache/dev-ruby/activesupport-4.2.6-r1
new file mode 100644
index 000000000000..f5559d77b463
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/activesupport-4.2.6-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby20? ( >=dev-ruby/i18n-0.7:0.7[ruby_targets_ruby20] >=dev-ruby/json-1.7.7:0[ruby_targets_ruby20] >=dev-ruby/tzinfo-1.1:1[ruby_targets_ruby20] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby20] >=dev-ruby/thread_safe-0.3.4:0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/i18n-0.7:0.7[ruby_targets_ruby21] >=dev-ruby/json-1.7.7:0[ruby_targets_ruby21] >=dev-ruby/tzinfo-1.1:1[ruby_targets_ruby21] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby21] >=dev-ruby/thread_safe-0.3.4:0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/i18n-0.7:0.7[ruby_targets_ruby22] >=dev-ruby/json-1.7.7:0[ruby_targets_ruby22] >=dev-ruby/tzinfo-1.1:1[ruby_targets_ruby22] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby22] >=dev-ruby/thread_safe-0.3.4:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/i18n-0.7:0.7[ruby_targets_ruby23] >=dev-ruby/json-1.7.7:0[ruby_targets_ruby23] >=dev-ruby/tzinfo-1.1:1[ruby_targets_ruby23] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby23] >=dev-ruby/thread_safe-0.3.4:0[ruby_targets_ruby23] ) ) ruby_targets_ruby20? ( test? ( >=dev-ruby/dalli-2.2.1[ruby_targets_ruby20] >=dev-ruby/nokogiri-1.4.5[ruby_targets_ruby20] >=dev-ruby/builder-3.1.0[ruby_targets_ruby20] dev-ruby/rack[ruby_targets_ruby20] dev-ruby/mocha:0.14[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/dalli-2.2.1[ruby_targets_ruby21] >=dev-ruby/nokogiri-1.4.5[ruby_targets_ruby21] >=dev-ruby/builder-3.1.0[ruby_targets_ruby21] dev-ruby/rack[ruby_targets_ruby21] dev-ruby/mocha:0.14[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/dalli-2.2.1[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.4.5[ruby_targets_ruby22] >=dev-ruby/builder-3.1.0[ruby_targets_ruby22] dev-ruby/rack[ruby_targets_ruby22] dev-ruby/mocha:0.14[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/dalli-2.2.1[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.4.5[ruby_targets_ruby23] >=dev-ruby/builder-3.1.0[ruby_targets_ruby23] dev-ruby/rack[ruby_targets_ruby23] dev-ruby/mocha:0.14[ruby_targets_ruby23] ) ) 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_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) 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_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) 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_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) 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=Utility Classes and Extension to the Standard Library
+EAPI=5
+HOMEPAGE=https://github.com/rails/rails
+IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test test
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/i18n-0.7:0.7[ruby_targets_ruby20] >=dev-ruby/json-1.7.7:0[ruby_targets_ruby20] >=dev-ruby/tzinfo-1.1:1[ruby_targets_ruby20] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby20] >=dev-ruby/thread_safe-0.3.4:0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/i18n-0.7:0.7[ruby_targets_ruby21] >=dev-ruby/json-1.7.7:0[ruby_targets_ruby21] >=dev-ruby/tzinfo-1.1:1[ruby_targets_ruby21] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby21] >=dev-ruby/thread_safe-0.3.4:0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/i18n-0.7:0.7[ruby_targets_ruby22] >=dev-ruby/json-1.7.7:0[ruby_targets_ruby22] >=dev-ruby/tzinfo-1.1:1[ruby_targets_ruby22] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby22] >=dev-ruby/thread_safe-0.3.4:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/i18n-0.7:0.7[ruby_targets_ruby23] >=dev-ruby/json-1.7.7:0[ruby_targets_ruby23] >=dev-ruby/tzinfo-1.1:1[ruby_targets_ruby23] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby23] >=dev-ruby/thread_safe-0.3.4:0[ruby_targets_ruby23] ) 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_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) 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_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
+SLOT=4.2
+SRC_URI=https://github.com/rails/rails/archive/v4.2.6.tar.gz -> rails-4.2.6.tgz
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	23ae8c186171e6476af098d2a50d0ee0	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=d0c5fa8ec8a3e0d760a65d8838fb50d8
diff --git a/metadata/md5-cache/dev-ruby/builder-3.0.4-r1 b/metadata/md5-cache/dev-ruby/builder-3.0.4-r1
index f7f27b532040..f210259d5074 100644
--- a/metadata/md5-cache/dev-ruby/builder-3.0.4-r1
+++ b/metadata/md5-cache/dev-ruby/builder-3.0.4-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby19? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) )
+DEPEND=ruby_targets_ruby20? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby20? ( doc? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) )
 DESCRIPTION=A builder to facilitate programatic generation of XML markup
 EAPI=5
 HOMEPAGE=http://rubyforge.org/projects/builder/
-IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby20 doc test test
 KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
+RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
+REQUIRED_USE=|| ( ruby_targets_ruby20 )
 SLOT=3
 SRC_URI=mirror://rubygems/builder-3.0.4.gem
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	23ae8c186171e6476af098d2a50d0ee0	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=53c8f6d0532a8c03cb317d81ca159b88
+_md5_=30043335f5eb4a1f20b49fe7f69a3167
diff --git a/metadata/md5-cache/dev-ruby/builder-3.0.4-r2 b/metadata/md5-cache/dev-ruby/builder-3.0.4-r2
index a64bc15c408d..542700ce6533 100644
--- a/metadata/md5-cache/dev-ruby/builder-3.0.4-r2
+++ b/metadata/md5-cache/dev-ruby/builder-3.0.4-r2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby19? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) )
+DEPEND=ruby_targets_ruby20? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[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/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[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] ) )
 DESCRIPTION=A builder to facilitate programatic generation of XML markup
 EAPI=5
 HOMEPAGE=http://rubyforge.org/projects/builder/
-IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 doc test test
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
+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=3
 SRC_URI=mirror://rubygems/builder-3.0.4.gem
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	23ae8c186171e6476af098d2a50d0ee0	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=d00022988b3fd473778ecf5fb2834dd4
+_md5_=ac13c745a8d8c8726cbfbae4f65cdbd1
diff --git a/metadata/md5-cache/dev-ruby/builder-3.1.4 b/metadata/md5-cache/dev-ruby/builder-3.1.4
index ffb69b898bab..56f0756f3fbc 100644
--- a/metadata/md5-cache/dev-ruby/builder-3.1.4
+++ b/metadata/md5-cache/dev-ruby/builder-3.1.4
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby19? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) )
+DEPEND=ruby_targets_ruby20? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[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/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[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] ) )
 DESCRIPTION=A builder to facilitate programatic generation of XML markup
 EAPI=5
 HOMEPAGE=http://rubyforge.org/projects/builder/
-IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 doc test test
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
+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=3.1
 SRC_URI=mirror://rubygems/builder-3.1.4.gem
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	23ae8c186171e6476af098d2a50d0ee0	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=a8d62a2c19c2baf49b08212e5d9ffb20
+_md5_=b63901cd338e7fc21d7c840b3c3cfb20
diff --git a/metadata/md5-cache/dev-ruby/builder-3.2.2 b/metadata/md5-cache/dev-ruby/builder-3.2.2
index dcda597559c2..2a267b4f8de3 100644
--- a/metadata/md5-cache/dev-ruby/builder-3.2.2
+++ b/metadata/md5-cache/dev-ruby/builder-3.2.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby19? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) )
+DEPEND=ruby_targets_ruby20? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby20? ( doc? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) )
 DESCRIPTION=A builder to facilitate programatic generation of XML markup
 EAPI=5
 HOMEPAGE=http://rubyforge.org/projects/builder/
-IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby20 doc test test
 KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
+RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
+REQUIRED_USE=|| ( ruby_targets_ruby20 )
 SLOT=3.2
 SRC_URI=mirror://rubygems/builder-3.2.2.gem
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	23ae8c186171e6476af098d2a50d0ee0	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=012120329bfa95bf95ac4f368377a4ae
+_md5_=5cfb8f410c2d8b9bb36d18a3bcbce8e1
diff --git a/metadata/md5-cache/dev-ruby/bundler-1.10.6 b/metadata/md5-cache/dev-ruby/bundler-1.10.6
index 2ebf4678c88b..0b46778d3305 100644
--- a/metadata/md5-cache/dev-ruby/bundler-1.10.6
+++ b/metadata/md5-cache/dev-ruby/bundler-1.10.6
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( doc? ( app-text/ronn[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( app-text/ronn[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( app-text/ronn[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( app-text/ronn[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) 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_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) 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_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
+DEPEND=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] ) ) ruby_targets_ruby20? ( doc? ( app-text/ronn[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( app-text/ronn[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( app-text/ronn[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/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[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=An easy way to vendor gem dependencies
 EAPI=5
 HOMEPAGE=https://github.com/carlhuda/bundler
-IUSE=doc test test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 test test
+IUSE=doc test test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 test test
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) dev-vcs/git ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) 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_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) 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_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
+RDEPEND=ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) dev-vcs/git 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 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/carlhuda/bundler/archive/v1.10.6.tar.gz -> bundler-1.10.6.tar.gz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	23ae8c186171e6476af098d2a50d0ee0	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=6ff06591607aa6585cd8e76b801b7af8
+_md5_=179a86f1f6cb2570a726be11f4de7328
diff --git a/metadata/md5-cache/dev-ruby/bundler-1.8.9 b/metadata/md5-cache/dev-ruby/bundler-1.8.9
index 2420648fc200..0494a0210ecc 100644
--- a/metadata/md5-cache/dev-ruby/bundler-1.8.9
+++ b/metadata/md5-cache/dev-ruby/bundler-1.8.9
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( doc? ( app-text/ronn[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( app-text/ronn[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) )
+DEPEND=test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ) ruby_targets_ruby20? ( doc? ( app-text/ronn[ruby_targets_ruby20] ) ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) )
 DESCRIPTION=An easy way to vendor gem dependencies
 EAPI=5
 HOMEPAGE=https://github.com/carlhuda/bundler
-IUSE=doc test test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 test test
+IUSE=doc test test elibc_FreeBSD ruby_targets_ruby20 test test
 KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) dev-vcs/git ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
+RDEPEND=ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) dev-vcs/git ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
+REQUIRED_USE=|| ( ruby_targets_ruby20 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/carlhuda/bundler/archive/v1.8.9.tar.gz -> bundler-1.8.9.tar.gz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	23ae8c186171e6476af098d2a50d0ee0	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=b4c45f50ae6aebf5f29b1ed2e62e885e
+_md5_=79d3c8a60ce34f58bbcd09c2f01e49f6
diff --git a/metadata/md5-cache/dev-ruby/bundler-1.9.10 b/metadata/md5-cache/dev-ruby/bundler-1.9.10
index 4189b039754e..758e76be7dfc 100644
--- a/metadata/md5-cache/dev-ruby/bundler-1.9.10
+++ b/metadata/md5-cache/dev-ruby/bundler-1.9.10
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( doc? ( app-text/ronn[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( app-text/ronn[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( app-text/ronn[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( app-text/ronn[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) 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_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) 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_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
+DEPEND=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] ) ) ruby_targets_ruby20? ( doc? ( app-text/ronn[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( app-text/ronn[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( app-text/ronn[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/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[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=An easy way to vendor gem dependencies
 EAPI=5
 HOMEPAGE=https://github.com/carlhuda/bundler
-IUSE=doc test test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 test test
+IUSE=doc test test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 test test
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) dev-vcs/git ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) 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_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) 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_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
+RDEPEND=ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) dev-vcs/git 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 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/carlhuda/bundler/archive/v1.9.10.tar.gz -> bundler-1.9.10.tar.gz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	23ae8c186171e6476af098d2a50d0ee0	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=6b928dbaaf336a3c420b69751e4a0ab7
+_md5_=030d62eafaf609f19fc93d6992bcfd86
diff --git a/metadata/md5-cache/dev-ruby/capistrano-2.15.5-r1 b/metadata/md5-cache/dev-ruby/capistrano-2.15.5-r1
index a691b4f234c5..f7d2e44d9eeb 100644
--- a/metadata/md5-cache/dev-ruby/capistrano-2.15.5-r1
+++ b/metadata/md5-cache/dev-ruby/capistrano-2.15.5-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby19? ( >=dev-ruby/net-ssh-2.0.14[ruby_targets_ruby19] >=dev-ruby/net-sftp-2.0.2[ruby_targets_ruby19] >=dev-ruby/net-scp-1.0.2[ruby_targets_ruby19] >=dev-ruby/net-ssh-gateway-1.1.0[ruby_targets_ruby19] >=dev-ruby/highline-1.2.7[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/net-ssh-2.0.14[ruby_targets_ruby20] >=dev-ruby/net-sftp-2.0.2[ruby_targets_ruby20] >=dev-ruby/net-scp-1.0.2[ruby_targets_ruby20] >=dev-ruby/net-ssh-gateway-1.1.0[ruby_targets_ruby20] >=dev-ruby/highline-1.2.7[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/mocha:0.12[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/mocha:0.12[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) )
+DEPEND=test? ( ruby_targets_ruby20? ( >=dev-ruby/net-ssh-2.0.14[ruby_targets_ruby20] >=dev-ruby/net-sftp-2.0.2[ruby_targets_ruby20] >=dev-ruby/net-scp-1.0.2[ruby_targets_ruby20] >=dev-ruby/net-ssh-gateway-1.1.0[ruby_targets_ruby20] >=dev-ruby/highline-1.2.7[ruby_targets_ruby20] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/mocha:0.12[ruby_targets_ruby20] ) ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) )
 DESCRIPTION=A distributed application deployment system
 EAPI=5
 HOMEPAGE=http://capistranorb.com/
-IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby20 test test
 KEYWORDS=amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/net-ssh-2.0.14[ruby_targets_ruby19] >=dev-ruby/net-sftp-2.0.2[ruby_targets_ruby19] >=dev-ruby/net-scp-1.0.2[ruby_targets_ruby19] >=dev-ruby/net-ssh-gateway-1.1.0[ruby_targets_ruby19] >=dev-ruby/highline-1.2.7[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/net-ssh-2.0.14[ruby_targets_ruby20] >=dev-ruby/net-sftp-2.0.2[ruby_targets_ruby20] >=dev-ruby/net-scp-1.0.2[ruby_targets_ruby20] >=dev-ruby/net-ssh-gateway-1.1.0[ruby_targets_ruby20] >=dev-ruby/highline-1.2.7[ruby_targets_ruby20] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
+RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/net-ssh-2.0.14[ruby_targets_ruby20] >=dev-ruby/net-sftp-2.0.2[ruby_targets_ruby20] >=dev-ruby/net-scp-1.0.2[ruby_targets_ruby20] >=dev-ruby/net-ssh-gateway-1.1.0[ruby_targets_ruby20] >=dev-ruby/highline-1.2.7[ruby_targets_ruby20] ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
+REQUIRED_USE=|| ( ruby_targets_ruby20 )
 SLOT=2
 SRC_URI=mirror://rubygems/capistrano-2.15.5.gem
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	23ae8c186171e6476af098d2a50d0ee0	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=af79b74cb09e07b51eec08c583d2ef12
+_md5_=9fc1b56e57d55b086b24a4ab8ce79649
diff --git a/metadata/md5-cache/dev-ruby/capistrano-2.15.5-r2 b/metadata/md5-cache/dev-ruby/capistrano-2.15.5-r2
index 7e2cd244960f..5afebad585c9 100644
--- a/metadata/md5-cache/dev-ruby/capistrano-2.15.5-r2
+++ b/metadata/md5-cache/dev-ruby/capistrano-2.15.5-r2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby19? ( >=dev-ruby/net-ssh-2.0.14[ruby_targets_ruby19] >=dev-ruby/net-sftp-2.0.2[ruby_targets_ruby19] >=dev-ruby/net-scp-1.0.2[ruby_targets_ruby19] >=dev-ruby/net-ssh-gateway-1.1.0[ruby_targets_ruby19] >=dev-ruby/highline-1.2.7[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/net-ssh-2.0.14[ruby_targets_ruby20] >=dev-ruby/net-sftp-2.0.2[ruby_targets_ruby20] >=dev-ruby/net-scp-1.0.2[ruby_targets_ruby20] >=dev-ruby/net-ssh-gateway-1.1.0[ruby_targets_ruby20] >=dev-ruby/highline-1.2.7[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/net-ssh-2.0.14[ruby_targets_ruby21] >=dev-ruby/net-sftp-2.0.2[ruby_targets_ruby21] >=dev-ruby/net-scp-1.0.2[ruby_targets_ruby21] >=dev-ruby/net-ssh-gateway-1.1.0[ruby_targets_ruby21] >=dev-ruby/highline-1.2.7[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/net-ssh-2.0.14[ruby_targets_ruby22] >=dev-ruby/net-sftp-2.0.2[ruby_targets_ruby22] >=dev-ruby/net-scp-1.0.2[ruby_targets_ruby22] >=dev-ruby/net-ssh-gateway-1.1.0[ruby_targets_ruby22] >=dev-ruby/highline-1.2.7[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) 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_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) 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_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
+DEPEND=test? ( ruby_targets_ruby20? ( >=dev-ruby/net-ssh-2.0.14[ruby_targets_ruby20] >=dev-ruby/net-sftp-2.0.2[ruby_targets_ruby20] >=dev-ruby/net-scp-1.0.2[ruby_targets_ruby20] >=dev-ruby/net-ssh-gateway-1.1.0[ruby_targets_ruby20] >=dev-ruby/highline-1.2.7[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/net-ssh-2.0.14[ruby_targets_ruby21] >=dev-ruby/net-sftp-2.0.2[ruby_targets_ruby21] >=dev-ruby/net-scp-1.0.2[ruby_targets_ruby21] >=dev-ruby/net-ssh-gateway-1.1.0[ruby_targets_ruby21] >=dev-ruby/highline-1.2.7[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/net-ssh-2.0.14[ruby_targets_ruby22] >=dev-ruby/net-sftp-2.0.2[ruby_targets_ruby22] >=dev-ruby/net-scp-1.0.2[ruby_targets_ruby22] >=dev-ruby/net-ssh-gateway-1.1.0[ruby_targets_ruby22] >=dev-ruby/highline-1.2.7[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/mocha:0.14[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/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[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=A distributed application deployment system
 EAPI=5
 HOMEPAGE=http://capistranorb.com/
-IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 test test
 KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/net-ssh-2.0.14[ruby_targets_ruby19] >=dev-ruby/net-sftp-2.0.2[ruby_targets_ruby19] >=dev-ruby/net-scp-1.0.2[ruby_targets_ruby19] >=dev-ruby/net-ssh-gateway-1.1.0[ruby_targets_ruby19] >=dev-ruby/highline-1.2.7[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/net-ssh-2.0.14[ruby_targets_ruby20] >=dev-ruby/net-sftp-2.0.2[ruby_targets_ruby20] >=dev-ruby/net-scp-1.0.2[ruby_targets_ruby20] >=dev-ruby/net-ssh-gateway-1.1.0[ruby_targets_ruby20] >=dev-ruby/highline-1.2.7[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/net-ssh-2.0.14[ruby_targets_ruby21] >=dev-ruby/net-sftp-2.0.2[ruby_targets_ruby21] >=dev-ruby/net-scp-1.0.2[ruby_targets_ruby21] >=dev-ruby/net-ssh-gateway-1.1.0[ruby_targets_ruby21] >=dev-ruby/highline-1.2.7[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/net-ssh-2.0.14[ruby_targets_ruby22] >=dev-ruby/net-sftp-2.0.2[ruby_targets_ruby22] >=dev-ruby/net-scp-1.0.2[ruby_targets_ruby22] >=dev-ruby/net-ssh-gateway-1.1.0[ruby_targets_ruby22] >=dev-ruby/highline-1.2.7[ruby_targets_ruby22] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) 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_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) 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_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
+RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/net-ssh-2.0.14[ruby_targets_ruby20] >=dev-ruby/net-sftp-2.0.2[ruby_targets_ruby20] >=dev-ruby/net-scp-1.0.2[ruby_targets_ruby20] >=dev-ruby/net-ssh-gateway-1.1.0[ruby_targets_ruby20] >=dev-ruby/highline-1.2.7[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/net-ssh-2.0.14[ruby_targets_ruby21] >=dev-ruby/net-sftp-2.0.2[ruby_targets_ruby21] >=dev-ruby/net-scp-1.0.2[ruby_targets_ruby21] >=dev-ruby/net-ssh-gateway-1.1.0[ruby_targets_ruby21] >=dev-ruby/highline-1.2.7[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/net-ssh-2.0.14[ruby_targets_ruby22] >=dev-ruby/net-sftp-2.0.2[ruby_targets_ruby22] >=dev-ruby/net-scp-1.0.2[ruby_targets_ruby22] >=dev-ruby/net-ssh-gateway-1.1.0[ruby_targets_ruby22] >=dev-ruby/highline-1.2.7[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=2
 SRC_URI=mirror://rubygems/capistrano-2.15.5.gem
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	23ae8c186171e6476af098d2a50d0ee0	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=4f94b83f8e483d6525835d3d221aea85
+_md5_=fac9e523a24bd966ee179bffb9c4b2bd
diff --git a/metadata/md5-cache/dev-ruby/capistrano-3.3.5 b/metadata/md5-cache/dev-ruby/capistrano-3.3.5
index fbc4906b926c..650ab205d2cd 100644
--- a/metadata/md5-cache/dev-ruby/capistrano-3.3.5
+++ b/metadata/md5-cache/dev-ruby/capistrano-3.3.5
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby19? ( >=dev-ruby/capistrano-stats-1.1.0:1[ruby_targets_ruby19] >=dev-ruby/sshkit-1.3:0[ruby_targets_ruby19] >=dev-ruby/rake-10.0.0[ruby_targets_ruby19] dev-ruby/i18n:*[ruby_targets_ruby19] !!<dev-ruby/capistrano-2.15.5-r2[ruby_targets_ruby19] ) 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_ruby19? ( test? ( dev-ruby/mocha:0.12[ruby_targets_ruby19] ) ) 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_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby19] ) ) 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_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) )
+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_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/capistrano-stats-1.1.0:1[ruby_targets_ruby19] >=dev-ruby/sshkit-1.3:0[ruby_targets_ruby19] >=dev-ruby/rake-10.0.0[ruby_targets_ruby19] dev-ruby/i18n:*[ruby_targets_ruby19] !!<dev-ruby/capistrano-2.15.5-r2[ruby_targets_ruby19] ) 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_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
+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
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	23ae8c186171e6476af098d2a50d0ee0	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=5ac70ad928f10eef520e87084916b41e
+_md5_=05511c4d3e70ec7fd42991f18c66c3b6
diff --git a/metadata/md5-cache/dev-ruby/capistrano-3.4.0 b/metadata/md5-cache/dev-ruby/capistrano-3.4.0
index 2e8747c9ae61..aefa5ee4d32d 100644
--- a/metadata/md5-cache/dev-ruby/capistrano-3.4.0
+++ b/metadata/md5-cache/dev-ruby/capistrano-3.4.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby19? ( >=dev-ruby/sshkit-1.3:0[ruby_targets_ruby19] >=dev-ruby/rake-10.0.0[ruby_targets_ruby19] dev-ruby/i18n:*[ruby_targets_ruby19] !!<dev-ruby/capistrano-2.15.5-r2[ruby_targets_ruby19] ) 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_ruby19? ( test? ( dev-ruby/mocha:0.12[ruby_targets_ruby19] ) ) 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_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby19] ) ) 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_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) )
+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_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/sshkit-1.3:0[ruby_targets_ruby19] >=dev-ruby/rake-10.0.0[ruby_targets_ruby19] dev-ruby/i18n:*[ruby_targets_ruby19] !!<dev-ruby/capistrano-2.15.5-r2[ruby_targets_ruby19] ) 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_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
+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
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	23ae8c186171e6476af098d2a50d0ee0	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=c78b4a3f055af9c3e4f8ec29d977ebfe
+_md5_=5b59f1c1fc8e00e4dd5d5dc64a99ed93
diff --git a/metadata/md5-cache/dev-ruby/dalli-2.7.6 b/metadata/md5-cache/dev-ruby/dalli-2.7.6
index 16cb7af2f3d1..82cece1c7997 100644
--- a/metadata/md5-cache/dev-ruby/dalli-2.7.6
+++ b/metadata/md5-cache/dev-ruby/dalli-2.7.6
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( >=net-misc/memcached-1.4.0 ) ruby_targets_ruby20? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby20] >=dev-ruby/mocha-0.13[ruby_targets_ruby20] dev-ruby/rack[ruby_targets_ruby20] >=dev-ruby/activesupport-4.1[ruby_targets_ruby20] dev-ruby/connection_pool[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby21] >=dev-ruby/mocha-0.13[ruby_targets_ruby21] dev-ruby/rack[ruby_targets_ruby21] >=dev-ruby/activesupport-4.1[ruby_targets_ruby21] dev-ruby/connection_pool[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby22] >=dev-ruby/mocha-0.13[ruby_targets_ruby22] dev-ruby/rack[ruby_targets_ruby22] >=dev-ruby/activesupport-4.1[ruby_targets_ruby22] dev-ruby/connection_pool[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? ( doc? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[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] ) )
+DEPEND=test? ( >=net-misc/memcached-1.4.0 ) ruby_targets_ruby20? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby20] >=dev-ruby/mocha-0.13[ruby_targets_ruby20] dev-ruby/rack[ruby_targets_ruby20] >=dev-ruby/activesupport-4.1[ruby_targets_ruby20] dev-ruby/connection_pool[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby21] >=dev-ruby/mocha-0.13[ruby_targets_ruby21] dev-ruby/rack[ruby_targets_ruby21] >=dev-ruby/activesupport-4.1[ruby_targets_ruby21] dev-ruby/connection_pool[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby22] >=dev-ruby/mocha-0.13[ruby_targets_ruby22] dev-ruby/rack[ruby_targets_ruby22] >=dev-ruby/activesupport-4.1[ruby_targets_ruby22] dev-ruby/connection_pool[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby23] >=dev-ruby/mocha-0.13[ruby_targets_ruby23] dev-ruby/rack[ruby_targets_ruby23] >=dev-ruby/activesupport-4.1[ruby_targets_ruby23] dev-ruby/connection_pool[ruby_targets_ruby23] ) ) 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_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby20? ( doc? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) 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_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) 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_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) 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=A high performance pure Ruby client for accessing memcached servers
 EAPI=5
 HOMEPAGE=https://github.com/petergoldstein/dalli
-IUSE=elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc64 ~x86
 LICENSE=MIT
-RDEPEND=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 )
+RDEPEND=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_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) 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_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/petergoldstein/dalli/archive/v2.7.6.tar.gz -> dalli-2.7.6.tar.gz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	23ae8c186171e6476af098d2a50d0ee0	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=17276a747c70e4002a52b32eb3eb6f6f
+_md5_=caf311201c8d9e5e874490244e2db2b8
diff --git a/metadata/md5-cache/dev-ruby/database_cleaner-1.4.1 b/metadata/md5-cache/dev-ruby/database_cleaner-1.4.1
index 01f185caf73d..da6ef1fdc4a3 100644
--- a/metadata/md5-cache/dev-ruby/database_cleaner-1.4.1
+++ b/metadata/md5-cache/dev-ruby/database_cleaner-1.4.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) 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_ruby19? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) 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_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
+DEPEND=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? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[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=Strategies for cleaning databases
 EAPI=5
 HOMEPAGE=https://github.com/bmabey/database_cleaner
-IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc test
+IUSE=elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) 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_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) 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_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
+RDEPEND=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/database_cleaner-1.4.1.gem
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	23ae8c186171e6476af098d2a50d0ee0	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=d5b64dc929cc90ef78062618c6a94206
+_md5_=04a2cdf896441b414adcdde87e70efcb
diff --git a/metadata/md5-cache/dev-ruby/database_cleaner-1.5.0 b/metadata/md5-cache/dev-ruby/database_cleaner-1.5.0
index c88dbca68b3b..be0fa61c0d49 100644
--- a/metadata/md5-cache/dev-ruby/database_cleaner-1.5.0
+++ b/metadata/md5-cache/dev-ruby/database_cleaner-1.5.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) 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_ruby19? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) 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_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
+DEPEND=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? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[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=Strategies for cleaning databases
 EAPI=5
 HOMEPAGE=https://github.com/bmabey/database_cleaner
-IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc test
+IUSE=elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) 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_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) 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_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
+RDEPEND=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/database_cleaner-1.5.0.gem
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	23ae8c186171e6476af098d2a50d0ee0	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=d5b64dc929cc90ef78062618c6a94206
+_md5_=04a2cdf896441b414adcdde87e70efcb
diff --git a/metadata/md5-cache/dev-ruby/database_cleaner-1.5.1 b/metadata/md5-cache/dev-ruby/database_cleaner-1.5.1
index 26650b68de50..57ae2dfd1e6e 100644
--- a/metadata/md5-cache/dev-ruby/database_cleaner-1.5.1
+++ b/metadata/md5-cache/dev-ruby/database_cleaner-1.5.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) 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_ruby19? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) 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_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
+DEPEND=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? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[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=Strategies for cleaning databases
 EAPI=5
 HOMEPAGE=https://github.com/bmabey/database_cleaner
-IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc test
+IUSE=elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) 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_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) 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_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
+RDEPEND=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/database_cleaner-1.5.1.gem
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	23ae8c186171e6476af098d2a50d0ee0	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=d5b64dc929cc90ef78062618c6a94206
+_md5_=04a2cdf896441b414adcdde87e70efcb
diff --git a/metadata/md5-cache/dev-ruby/date_validator-0.8.0 b/metadata/md5-cache/dev-ruby/date_validator-0.8.0
index f929e20cb6b1..f483020ae420 100644
--- a/metadata/md5-cache/dev-ruby/date_validator-0.8.0
+++ b/metadata/md5-cache/dev-ruby/date_validator-0.8.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby19? ( >=dev-ruby/activemodel-3.0:*[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/activemodel-3.0:*[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/activemodel-3.0:*[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/minitest[ruby_targets_ruby19] >=dev-ruby/tzinfo-0.3[ruby_targets_ruby19] >=dev-ruby/activesupport-3.0[ruby_targets_ruby19] ) doc? ( dev-ruby/yard[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/minitest[ruby_targets_ruby20] >=dev-ruby/tzinfo-0.3[ruby_targets_ruby20] >=dev-ruby/activesupport-3.0[ruby_targets_ruby20] ) doc? ( dev-ruby/yard[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/minitest[ruby_targets_ruby21] >=dev-ruby/tzinfo-0.3[ruby_targets_ruby21] >=dev-ruby/activesupport-3.0[ruby_targets_ruby21] ) doc? ( dev-ruby/yard[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) )
+DEPEND=test? ( ruby_targets_ruby20? ( >=dev-ruby/activemodel-3.0:*[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/activemodel-3.0:*[ruby_targets_ruby21] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/minitest[ruby_targets_ruby20] >=dev-ruby/tzinfo-0.3[ruby_targets_ruby20] >=dev-ruby/activesupport-3.0[ruby_targets_ruby20] ) doc? ( dev-ruby/yard[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/minitest[ruby_targets_ruby21] >=dev-ruby/tzinfo-0.3[ruby_targets_ruby21] >=dev-ruby/activesupport-3.0[ruby_targets_ruby21] ) doc? ( dev-ruby/yard[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/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[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] ) )
 DESCRIPTION=Simple, ORM agnostic, Ruby 1.9 compatible date validator for Rails 3
 EAPI=5
 HOMEPAGE=https://github.com/codegram/date_validator
-IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/activemodel-3.0:*[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/activemodel-3.0:*[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/activemodel-3.0:*[ruby_targets_ruby21] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
+RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/activemodel-3.0:*[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/activemodel-3.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 )
 SLOT=3
 SRC_URI=mirror://rubygems/date_validator-0.8.0.gem
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	23ae8c186171e6476af098d2a50d0ee0	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=ce5d3b3337d4e26bb1d0e6103ea66ee3
+_md5_=a27c3a138cf65adec738259c0cb03809
diff --git a/metadata/md5-cache/dev-ruby/date_validator-0.8.1 b/metadata/md5-cache/dev-ruby/date_validator-0.8.1
index af60dbb04aa5..911892219531 100644
--- a/metadata/md5-cache/dev-ruby/date_validator-0.8.1
+++ b/metadata/md5-cache/dev-ruby/date_validator-0.8.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby19? ( >=dev-ruby/activemodel-3.0:*[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/activemodel-3.0:*[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/activemodel-3.0:*[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/minitest[ruby_targets_ruby19] >=dev-ruby/tzinfo-0.3[ruby_targets_ruby19] >=dev-ruby/activesupport-3.0[ruby_targets_ruby19] ) doc? ( dev-ruby/yard[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/minitest[ruby_targets_ruby20] >=dev-ruby/tzinfo-0.3[ruby_targets_ruby20] >=dev-ruby/activesupport-3.0[ruby_targets_ruby20] ) doc? ( dev-ruby/yard[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/minitest[ruby_targets_ruby21] >=dev-ruby/tzinfo-0.3[ruby_targets_ruby21] >=dev-ruby/activesupport-3.0[ruby_targets_ruby21] ) doc? ( dev-ruby/yard[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) )
+DEPEND=test? ( ruby_targets_ruby20? ( >=dev-ruby/activemodel-3.0:*[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/activemodel-3.0:*[ruby_targets_ruby21] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/minitest[ruby_targets_ruby20] >=dev-ruby/tzinfo-0.3[ruby_targets_ruby20] >=dev-ruby/activesupport-3.0[ruby_targets_ruby20] ) doc? ( dev-ruby/yard[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/minitest[ruby_targets_ruby21] >=dev-ruby/tzinfo-0.3[ruby_targets_ruby21] >=dev-ruby/activesupport-3.0[ruby_targets_ruby21] ) doc? ( dev-ruby/yard[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/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[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] ) )
 DESCRIPTION=Simple, ORM agnostic, Ruby 1.9 compatible date validator for Rails 3
 EAPI=5
 HOMEPAGE=https://github.com/codegram/date_validator
-IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/activemodel-3.0:*[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/activemodel-3.0:*[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/activemodel-3.0:*[ruby_targets_ruby21] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
+RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/activemodel-3.0:*[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/activemodel-3.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 )
 SLOT=3
 SRC_URI=mirror://rubygems/date_validator-0.8.1.gem
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	23ae8c186171e6476af098d2a50d0ee0	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=ce5d3b3337d4e26bb1d0e6103ea66ee3
+_md5_=a27c3a138cf65adec738259c0cb03809
diff --git a/metadata/md5-cache/dev-ruby/facter-2.4.1 b/metadata/md5-cache/dev-ruby/facter-2.4.1
index 5d79e08b21fc..6c217d1d4f47 100644
--- a/metadata/md5-cache/dev-ruby/facter-2.4.1
+++ b/metadata/md5-cache/dev-ruby/facter-2.4.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( app-emulation/virt-what sys-apps/net-tools sys-apps/lsb-release dmi? ( sys-apps/dmidecode ) pciutils? ( sys-apps/pciutils ) ) ruby_targets_ruby19? ( test? ( dev-ruby/mocha:0.13[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/mocha:0.13[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby20] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) )
+DEPEND=test? ( app-emulation/virt-what sys-apps/net-tools sys-apps/lsb-release dmi? ( sys-apps/dmidecode ) pciutils? ( sys-apps/pciutils ) ) ruby_targets_ruby20? ( test? ( dev-ruby/mocha:0.13[ruby_targets_ruby20] ) ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby20] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby20] ) ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) )
 DESCRIPTION=A cross-platform Ruby library for retrieving facts from operating systems
 EAPI=5
 HOMEPAGE=http://www.puppetlabs.com/puppet/related-projects/facter/
-IUSE=+dmi +pciutils +virt elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 test test
+IUSE=+dmi +pciutils +virt elibc_FreeBSD ruby_targets_ruby20 test test
 KEYWORDS=amd64 hppa ppc ppc64 sparc x86
 LICENSE=Apache-2.0
-RDEPEND=app-emulation/virt-what sys-apps/net-tools sys-apps/lsb-release dmi? ( sys-apps/dmidecode ) pciutils? ( sys-apps/pciutils ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
+RDEPEND=app-emulation/virt-what sys-apps/net-tools sys-apps/lsb-release dmi? ( sys-apps/dmidecode ) pciutils? ( sys-apps/pciutils ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
+REQUIRED_USE=|| ( ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/facter-2.4.1.gem
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	23ae8c186171e6476af098d2a50d0ee0	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=d0ddbf2aa56a4e80b66c4221a3fd4273
+_md5_=5a474691167db47aa92f343d5bfe7e32
diff --git a/metadata/md5-cache/dev-ruby/facter-2.4.1-r1 b/metadata/md5-cache/dev-ruby/facter-2.4.1-r1
index 42acf954aee9..0f30d7f603cc 100644
--- a/metadata/md5-cache/dev-ruby/facter-2.4.1-r1
+++ b/metadata/md5-cache/dev-ruby/facter-2.4.1-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( app-emulation/virt-what sys-apps/net-tools sys-apps/lsb-release dmi? ( sys-apps/dmidecode ) pciutils? ( sys-apps/pciutils ) ) ruby_targets_ruby19? ( test? ( dev-ruby/mocha:1.0[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/mocha:1.0[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/mocha:1.0[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby19] ) ) 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_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) )
+DEPEND=test? ( app-emulation/virt-what sys-apps/net-tools sys-apps/lsb-release dmi? ( sys-apps/dmidecode ) pciutils? ( sys-apps/pciutils ) ) ruby_targets_ruby20? ( test? ( dev-ruby/mocha:1.0[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/mocha: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/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 cross-platform Ruby library for retrieving facts from operating systems
 EAPI=5
 HOMEPAGE=http://www.puppetlabs.com/puppet/related-projects/facter/
-IUSE=+dmi +pciutils +virt elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 test test
+IUSE=+dmi +pciutils +virt elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 test test
 KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
 LICENSE=Apache-2.0
-RDEPEND=app-emulation/virt-what sys-apps/net-tools sys-apps/lsb-release dmi? ( sys-apps/dmidecode ) pciutils? ( sys-apps/pciutils ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
+RDEPEND=app-emulation/virt-what sys-apps/net-tools sys-apps/lsb-release dmi? ( sys-apps/dmidecode ) pciutils? ( sys-apps/pciutils ) 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/facter-2.4.1.gem
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	23ae8c186171e6476af098d2a50d0ee0	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=5b19658667286c263a27814cb11e8c96
+_md5_=abe307a529f184e5d64ccfe8fd3edcde
diff --git a/metadata/md5-cache/dev-ruby/facter-2.4.3 b/metadata/md5-cache/dev-ruby/facter-2.4.3
index 66a9f2113be5..842b8e5134eb 100644
--- a/metadata/md5-cache/dev-ruby/facter-2.4.3
+++ b/metadata/md5-cache/dev-ruby/facter-2.4.3
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( app-emulation/virt-what sys-apps/net-tools sys-apps/lsb-release dmi? ( sys-apps/dmidecode ) pciutils? ( sys-apps/pciutils ) ) ruby_targets_ruby19? ( test? ( dev-ruby/mocha:1.0[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/mocha:1.0[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/mocha:1.0[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/mocha:1.0[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) 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_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby19] ) ) 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_ruby22? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby22] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) 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_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
+DEPEND=test? ( app-emulation/virt-what sys-apps/net-tools sys-apps/lsb-release dmi? ( sys-apps/dmidecode ) pciutils? ( sys-apps/pciutils ) ) ruby_targets_ruby20? ( test? ( dev-ruby/mocha:1.0[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/mocha:1.0[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/mocha:1.0[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: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_ruby22? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby22] >=dev-ruby/rspec-core-2.14.8-r2[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=A cross-platform Ruby library for retrieving facts from operating systems
 EAPI=5
 HOMEPAGE=http://www.puppetlabs.com/puppet/related-projects/facter/
-IUSE=+dmi +pciutils +virt elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 test test
+IUSE=+dmi +pciutils +virt elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 test test
 KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
 LICENSE=Apache-2.0
-RDEPEND=app-emulation/virt-what sys-apps/net-tools sys-apps/lsb-release dmi? ( sys-apps/dmidecode ) pciutils? ( sys-apps/pciutils ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) 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_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) 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_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
+RDEPEND=app-emulation/virt-what sys-apps/net-tools sys-apps/lsb-release dmi? ( sys-apps/dmidecode ) pciutils? ( sys-apps/pciutils ) 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/facter-2.4.3.gem
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	23ae8c186171e6476af098d2a50d0ee0	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=4cb2def56fb7cdc9f794f2a54c3432a5
+_md5_=836cad8c166776417372e802b6450466
diff --git a/metadata/md5-cache/dev-ruby/facter-2.4.4 b/metadata/md5-cache/dev-ruby/facter-2.4.4
index 8a8888da794e..2fd0afcc6fd3 100644
--- a/metadata/md5-cache/dev-ruby/facter-2.4.4
+++ b/metadata/md5-cache/dev-ruby/facter-2.4.4
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( app-emulation/virt-what sys-apps/net-tools sys-apps/lsb-release dmi? ( sys-apps/dmidecode ) pciutils? ( sys-apps/pciutils ) ) ruby_targets_ruby19? ( test? ( dev-ruby/mocha:1.0[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/mocha:1.0[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/mocha:1.0[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/mocha:1.0[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) 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_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby19] ) ) 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_ruby22? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby22] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) 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_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
+DEPEND=test? ( app-emulation/virt-what sys-apps/net-tools sys-apps/lsb-release dmi? ( sys-apps/dmidecode ) pciutils? ( sys-apps/pciutils ) ) ruby_targets_ruby20? ( test? ( dev-ruby/mocha:1.0[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/mocha:1.0[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/mocha:1.0[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: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_ruby22? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby22] >=dev-ruby/rspec-core-2.14.8-r2[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=A cross-platform Ruby library for retrieving facts from operating systems
 EAPI=5
 HOMEPAGE=http://www.puppetlabs.com/puppet/related-projects/facter/
-IUSE=+dmi +pciutils +virt elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 test test
+IUSE=+dmi +pciutils +virt elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 test test
 KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
 LICENSE=Apache-2.0
-RDEPEND=app-emulation/virt-what sys-apps/net-tools sys-apps/lsb-release dmi? ( sys-apps/dmidecode ) pciutils? ( sys-apps/pciutils ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) 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_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) 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_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
+RDEPEND=app-emulation/virt-what sys-apps/net-tools sys-apps/lsb-release dmi? ( sys-apps/dmidecode ) pciutils? ( sys-apps/pciutils ) 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/facter-2.4.4.gem
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	23ae8c186171e6476af098d2a50d0ee0	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=4cb2def56fb7cdc9f794f2a54c3432a5
+_md5_=836cad8c166776417372e802b6450466
diff --git a/metadata/md5-cache/dev-ruby/facter-3.0.2-r1 b/metadata/md5-cache/dev-ruby/facter-3.0.2-r1
index 7fb889549161..7220cd63cc25 100644
--- a/metadata/md5-cache/dev-ruby/facter-3.0.2-r1
+++ b/metadata/md5-cache/dev-ruby/facter-3.0.2-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( >=sys-devel/gcc-4.8:* >=dev-libs/boost-1.54 >=dev-cpp/yaml-cpp-0.5.1 dev-libs/openssl:* sys-apps/util-linux app-emulation/virt-what net-misc/curl ) sys-devel/make >=dev-util/cmake-2.8.12 ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 )
+DEPEND=test? ( >=sys-devel/gcc-4.8:* >=dev-libs/boost-1.54 >=dev-cpp/yaml-cpp-0.5.1 dev-libs/openssl:* sys-apps/util-linux app-emulation/virt-what net-misc/curl ) sys-devel/make >=dev-util/cmake-2.8.12 ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 )
 DESCRIPTION=A cross-platform ruby library for retrieving facts from operating systems
 EAPI=5
 HOMEPAGE=http://www.puppetlabs.com/puppet/related-projects/facter/
-IUSE=debug test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22
+IUSE=debug test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22
 KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~x86
 LICENSE=Apache-2.0
-RDEPEND=>=sys-devel/gcc-4.8:* >=dev-libs/boost-1.54 >=dev-cpp/yaml-cpp-0.5.1 dev-libs/openssl:* sys-apps/util-linux app-emulation/virt-what net-misc/curl ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
+RDEPEND=>=sys-devel/gcc-4.8:* >=dev-libs/boost-1.54 >=dev-cpp/yaml-cpp-0.5.1 dev-libs/openssl:* sys-apps/util-linux app-emulation/virt-what net-misc/curl ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 )
+REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://downloads.puppetlabs.com/facter/facter-3.0.2.tar.gz
 _eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	23ae8c186171e6476af098d2a50d0ee0	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=ee95e29e58f4149c4f2f96e544f0d23f
+_md5_=23b289d24712a7795b58b5fbe6a0e2f5
diff --git a/metadata/md5-cache/dev-ruby/facter-3.1.2 b/metadata/md5-cache/dev-ruby/facter-3.1.2
index 92a840554659..4b29ac450905 100644
--- a/metadata/md5-cache/dev-ruby/facter-3.1.2
+++ b/metadata/md5-cache/dev-ruby/facter-3.1.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( >=sys-devel/gcc-4.8:* >=dev-libs/boost-1.54[nls] >=dev-cpp/yaml-cpp-0.5.1 dev-libs/openssl:* sys-apps/util-linux app-emulation/virt-what net-misc/curl ) sys-devel/make >=dev-util/cmake-2.8.12 ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 )
+DEPEND=test? ( >=sys-devel/gcc-4.8:* >=dev-libs/boost-1.54[nls] >=dev-cpp/yaml-cpp-0.5.1 dev-libs/openssl:* sys-apps/util-linux app-emulation/virt-what net-misc/curl ) sys-devel/make >=dev-util/cmake-2.8.12 ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 )
 DESCRIPTION=A cross-platform ruby library for retrieving facts from operating systems
 EAPI=5
 HOMEPAGE=http://www.puppetlabs.com/puppet/related-projects/facter/
-IUSE=debug test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22
+IUSE=debug test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22
 KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~x86
 LICENSE=Apache-2.0
-RDEPEND=>=sys-devel/gcc-4.8:* >=dev-libs/boost-1.54[nls] >=dev-cpp/yaml-cpp-0.5.1 dev-libs/openssl:* sys-apps/util-linux app-emulation/virt-what net-misc/curl ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
+RDEPEND=>=sys-devel/gcc-4.8:* >=dev-libs/boost-1.54[nls] >=dev-cpp/yaml-cpp-0.5.1 dev-libs/openssl:* sys-apps/util-linux app-emulation/virt-what net-misc/curl ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 )
+REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://downloads.puppetlabs.com/facter/facter-3.1.2.tar.gz
 _eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	23ae8c186171e6476af098d2a50d0ee0	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=3aed1a8c01bddc6c7b08ad78ac093181
+_md5_=585f9b13a61622d02aae4d60c236b521
diff --git a/metadata/md5-cache/dev-ruby/facter-3.1.3 b/metadata/md5-cache/dev-ruby/facter-3.1.3
index 7718cffcb568..919807cabeed 100644
--- a/metadata/md5-cache/dev-ruby/facter-3.1.3
+++ b/metadata/md5-cache/dev-ruby/facter-3.1.3
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( >=sys-devel/gcc-4.8:* >=dev-libs/boost-1.54[nls] >=dev-cpp/yaml-cpp-0.5.1 dev-libs/openssl:* sys-apps/util-linux app-emulation/virt-what net-misc/curl ) sys-devel/make >=dev-util/cmake-2.8.12 ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 )
+DEPEND=test? ( >=sys-devel/gcc-4.8:* >=dev-libs/boost-1.54[nls] >=dev-cpp/yaml-cpp-0.5.1 dev-libs/openssl:* sys-apps/util-linux app-emulation/virt-what net-misc/curl ) sys-devel/make >=dev-util/cmake-2.8.12 ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 )
 DESCRIPTION=A cross-platform ruby library for retrieving facts from operating systems
 EAPI=5
 HOMEPAGE=http://www.puppetlabs.com/puppet/related-projects/facter/
-IUSE=debug test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22
+IUSE=debug test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22
 KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~x86
 LICENSE=Apache-2.0
-RDEPEND=>=sys-devel/gcc-4.8:* >=dev-libs/boost-1.54[nls] >=dev-cpp/yaml-cpp-0.5.1 dev-libs/openssl:* sys-apps/util-linux app-emulation/virt-what net-misc/curl ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
+RDEPEND=>=sys-devel/gcc-4.8:* >=dev-libs/boost-1.54[nls] >=dev-cpp/yaml-cpp-0.5.1 dev-libs/openssl:* sys-apps/util-linux app-emulation/virt-what net-misc/curl ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 )
+REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://downloads.puppetlabs.com/facter/facter-3.1.3.tar.gz
 _eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	23ae8c186171e6476af098d2a50d0ee0	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=3aed1a8c01bddc6c7b08ad78ac093181
+_md5_=585f9b13a61622d02aae4d60c236b521
diff --git a/metadata/md5-cache/dev-ruby/flexmock-1.3.3 b/metadata/md5-cache/dev-ruby/flexmock-1.3.3
index 6a61f44e00c5..2fa5de41dad0 100644
--- a/metadata/md5-cache/dev-ruby/flexmock-1.3.3
+++ b/metadata/md5-cache/dev-ruby/flexmock-1.3.3
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) )
+DEPEND=ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby20] ) ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) )
 DESCRIPTION=Simple mock object library for Ruby unit testing
 EAPI=5
 HOMEPAGE=https://github.com/jimweirich/flexmock
-IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 doc test
+IUSE=elibc_FreeBSD ruby_targets_ruby20 doc test
 KEYWORDS=amd64 ~arm ~hppa ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=flexmock
-RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
+RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
+REQUIRED_USE=|| ( ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/flexmock-1.3.3.gem
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	23ae8c186171e6476af098d2a50d0ee0	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=9951b69071feb00a125d5744acabb45d
+_md5_=5d021bb4cff6db0d36d3a93f06d9ede1
diff --git a/metadata/md5-cache/dev-ruby/flexmock-1.3.3-r1 b/metadata/md5-cache/dev-ruby/flexmock-1.3.3-r1
index b897c7f0bb7c..68d96d7f4cbd 100644
--- a/metadata/md5-cache/dev-ruby/flexmock-1.3.3-r1
+++ b/metadata/md5-cache/dev-ruby/flexmock-1.3.3-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) )
+DEPEND=ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec: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] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) )
 DESCRIPTION=Simple mock object library for Ruby unit testing
 EAPI=5
 HOMEPAGE=https://github.com/jimweirich/flexmock
-IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 doc test
+IUSE=elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 doc test
 KEYWORDS=amd64 ~arm ~hppa ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=flexmock
-RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
+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/flexmock-1.3.3.gem
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	23ae8c186171e6476af098d2a50d0ee0	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=1f78bc2c4bce1e8211c85be7d26cf5ac
+_md5_=72495ef3e7588fb2bab59b9b773513a4
diff --git a/metadata/md5-cache/dev-ruby/gherkin-2.12.0-r2 b/metadata/md5-cache/dev-ruby/gherkin-2.12.0-r2
index 0f2a256e0428..9e24009dad8d 100644
--- a/metadata/md5-cache/dev-ruby/gherkin-2.12.0-r2
+++ b/metadata/md5-cache/dev-ruby/gherkin-2.12.0-r2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-util/ragel ruby_targets_ruby19? ( dev-ruby/rake-compiler[ruby_targets_ruby19] test? ( >=dev-ruby/builder-2.1.2[ruby_targets_ruby19] >=dev-util/cucumber-1.1.3[ruby_targets_ruby19] >=dev-ruby/rspec-2.6.0[ruby_targets_ruby19] >=dev-ruby/term-ansicolor-1.0.5[ruby_targets_ruby19] ) doc? ( >=dev-ruby/yard-0.8.3[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( dev-ruby/rake-compiler[ruby_targets_ruby20] test? ( >=dev-ruby/builder-2.1.2[ruby_targets_ruby20] >=dev-util/cucumber-1.1.3[ruby_targets_ruby20] >=dev-ruby/rspec-2.6.0[ruby_targets_ruby20] >=dev-ruby/term-ansicolor-1.0.5[ruby_targets_ruby20] ) doc? ( >=dev-ruby/yard-0.8.3[ruby_targets_ruby20] ) ) test? ( ruby_targets_ruby19? ( >=dev-ruby/multi_json-1.3[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/multi_json-1.3[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) )
+DEPEND=dev-util/ragel ruby_targets_ruby20? ( dev-ruby/rake-compiler[ruby_targets_ruby20] test? ( >=dev-ruby/builder-2.1.2[ruby_targets_ruby20] >=dev-util/cucumber-1.1.3[ruby_targets_ruby20] >=dev-ruby/rspec-2.6.0[ruby_targets_ruby20] >=dev-ruby/term-ansicolor-1.0.5[ruby_targets_ruby20] ) doc? ( >=dev-ruby/yard-0.8.3[ruby_targets_ruby20] ) ) test? ( ruby_targets_ruby20? ( >=dev-ruby/multi_json-1.3[ruby_targets_ruby20] ) ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) )
 DESCRIPTION=Fast Gherkin lexer and parser based on Ragel
 EAPI=5
 HOMEPAGE=https://github.com/cucumber/gherkin
-IUSE=doc test test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 doc test
+IUSE=doc test test elibc_FreeBSD ruby_targets_ruby20 doc test
 KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 sparc x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/multi_json-1.3[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/multi_json-1.3[ruby_targets_ruby20] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
+RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/multi_json-1.3[ruby_targets_ruby20] ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
+REQUIRED_USE=|| ( ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=https://github.com/cucumber/gherkin/archive/v2.12.0.tar.gz -> gherkin-2.12.0-git.tgz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	23ae8c186171e6476af098d2a50d0ee0	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=02e70ade55dd2ab611215f3291e541c4
+_md5_=4c434ed9efd514d9b0241c59ef569e2a
diff --git a/metadata/md5-cache/dev-ruby/gherkin-2.12.0-r3 b/metadata/md5-cache/dev-ruby/gherkin-2.12.0-r3
index e3114d03fbeb..40d0be42141b 100644
--- a/metadata/md5-cache/dev-ruby/gherkin-2.12.0-r3
+++ b/metadata/md5-cache/dev-ruby/gherkin-2.12.0-r3
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-util/ragel ruby_targets_ruby19? ( dev-ruby/rake-compiler[ruby_targets_ruby19] test? ( >=dev-ruby/builder-2.1.2[ruby_targets_ruby19] >=dev-util/cucumber-1.1.3[ruby_targets_ruby19] >=dev-ruby/rspec-2.6.0:2[ruby_targets_ruby19] >=dev-ruby/term-ansicolor-1.0.5[ruby_targets_ruby19] ) doc? ( >=dev-ruby/yard-0.8.3[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( dev-ruby/rake-compiler[ruby_targets_ruby20] test? ( >=dev-ruby/builder-2.1.2[ruby_targets_ruby20] >=dev-util/cucumber-1.1.3[ruby_targets_ruby20] >=dev-ruby/rspec-2.6.0:2[ruby_targets_ruby20] >=dev-ruby/term-ansicolor-1.0.5[ruby_targets_ruby20] ) doc? ( >=dev-ruby/yard-0.8.3[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( dev-ruby/rake-compiler[ruby_targets_ruby21] test? ( >=dev-ruby/builder-2.1.2[ruby_targets_ruby21] >=dev-util/cucumber-1.1.3[ruby_targets_ruby21] >=dev-ruby/rspec-2.6.0:2[ruby_targets_ruby21] >=dev-ruby/term-ansicolor-1.0.5[ruby_targets_ruby21] ) doc? ( >=dev-ruby/yard-0.8.3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( dev-ruby/rake-compiler[ruby_targets_ruby22] test? ( >=dev-ruby/builder-2.1.2[ruby_targets_ruby22] >=dev-util/cucumber-1.1.3[ruby_targets_ruby22] >=dev-ruby/rspec-2.6.0:2[ruby_targets_ruby22] >=dev-ruby/term-ansicolor-1.0.5[ruby_targets_ruby22] ) doc? ( >=dev-ruby/yard-0.8.3[ruby_targets_ruby22] ) ) test? ( ruby_targets_ruby19? ( >=dev-ruby/multi_json-1.3[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/multi_json-1.3[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/multi_json-1.3[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/multi_json-1.3[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) 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_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) 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_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
+DEPEND=dev-util/ragel ruby_targets_ruby20? ( dev-ruby/rake-compiler[ruby_targets_ruby20] test? ( >=dev-ruby/builder-2.1.2[ruby_targets_ruby20] >=dev-util/cucumber-1.1.3[ruby_targets_ruby20] >=dev-ruby/rspec-2.6.0:2[ruby_targets_ruby20] >=dev-ruby/term-ansicolor-1.0.5[ruby_targets_ruby20] ) doc? ( >=dev-ruby/yard-0.8.3[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( dev-ruby/rake-compiler[ruby_targets_ruby21] test? ( >=dev-ruby/builder-2.1.2[ruby_targets_ruby21] >=dev-util/cucumber-1.1.3[ruby_targets_ruby21] >=dev-ruby/rspec-2.6.0:2[ruby_targets_ruby21] >=dev-ruby/term-ansicolor-1.0.5[ruby_targets_ruby21] ) doc? ( >=dev-ruby/yard-0.8.3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( dev-ruby/rake-compiler[ruby_targets_ruby22] test? ( >=dev-ruby/builder-2.1.2[ruby_targets_ruby22] >=dev-util/cucumber-1.1.3[ruby_targets_ruby22] >=dev-ruby/rspec-2.6.0:2[ruby_targets_ruby22] >=dev-ruby/term-ansicolor-1.0.5[ruby_targets_ruby22] ) doc? ( >=dev-ruby/yard-0.8.3[ruby_targets_ruby22] ) ) test? ( ruby_targets_ruby20? ( >=dev-ruby/multi_json-1.3[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/multi_json-1.3[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/multi_json-1.3[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] ) 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=Fast Gherkin lexer and parser based on Ragel
 EAPI=5
 HOMEPAGE=https://github.com/cucumber/gherkin
-IUSE=doc test test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc test
+IUSE=doc test test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc test
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/multi_json-1.3[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/multi_json-1.3[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/multi_json-1.3[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/multi_json-1.3[ruby_targets_ruby22] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) 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_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) 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_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
+RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/multi_json-1.3[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/multi_json-1.3[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/multi_json-1.3[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=https://github.com/cucumber/gherkin/archive/v2.12.0.tar.gz -> gherkin-2.12.0-git.tgz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	23ae8c186171e6476af098d2a50d0ee0	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=e8a99850c8888787e46a99155b93a9c4
+_md5_=3a468aea67ed4eeda1b9115b66f8aeb7
diff --git a/metadata/md5-cache/dev-ruby/gherkin-2.12.2 b/metadata/md5-cache/dev-ruby/gherkin-2.12.2
index 447cb1a10541..d8b646b383c1 100644
--- a/metadata/md5-cache/dev-ruby/gherkin-2.12.2
+++ b/metadata/md5-cache/dev-ruby/gherkin-2.12.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-util/ragel ruby_targets_ruby19? ( dev-ruby/rake-compiler[ruby_targets_ruby19] dev-ruby/ruby-beautify[ruby_targets_ruby19] test? ( >=dev-ruby/builder-2.1.2[ruby_targets_ruby19] >=dev-util/cucumber-1.1.3[ruby_targets_ruby19] >=dev-ruby/rspec-2.6.0[ruby_targets_ruby19] >=dev-ruby/term-ansicolor-1.0.5[ruby_targets_ruby19] ) doc? ( >=dev-ruby/yard-0.8.3[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( dev-ruby/rake-compiler[ruby_targets_ruby20] dev-ruby/ruby-beautify[ruby_targets_ruby20] test? ( >=dev-ruby/builder-2.1.2[ruby_targets_ruby20] >=dev-util/cucumber-1.1.3[ruby_targets_ruby20] >=dev-ruby/rspec-2.6.0[ruby_targets_ruby20] >=dev-ruby/term-ansicolor-1.0.5[ruby_targets_ruby20] ) doc? ( >=dev-ruby/yard-0.8.3[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( dev-ruby/rake-compiler[ruby_targets_ruby21] dev-ruby/ruby-beautify[ruby_targets_ruby21] test? ( >=dev-ruby/builder-2.1.2[ruby_targets_ruby21] >=dev-util/cucumber-1.1.3[ruby_targets_ruby21] >=dev-ruby/rspec-2.6.0[ruby_targets_ruby21] >=dev-ruby/term-ansicolor-1.0.5[ruby_targets_ruby21] ) doc? ( >=dev-ruby/yard-0.8.3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( dev-ruby/rake-compiler[ruby_targets_ruby22] dev-ruby/ruby-beautify[ruby_targets_ruby22] test? ( >=dev-ruby/builder-2.1.2[ruby_targets_ruby22] >=dev-util/cucumber-1.1.3[ruby_targets_ruby22] >=dev-ruby/rspec-2.6.0[ruby_targets_ruby22] >=dev-ruby/term-ansicolor-1.0.5[ruby_targets_ruby22] ) doc? ( >=dev-ruby/yard-0.8.3[ruby_targets_ruby22] ) ) test? ( ruby_targets_ruby19? ( >=dev-ruby/multi_json-1.3[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/multi_json-1.3[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/multi_json-1.3[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/multi_json-1.3[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) 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_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) 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_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
+DEPEND=dev-util/ragel ruby_targets_ruby20? ( dev-ruby/rake-compiler[ruby_targets_ruby20] dev-ruby/ruby-beautify[ruby_targets_ruby20] test? ( >=dev-ruby/builder-2.1.2[ruby_targets_ruby20] >=dev-util/cucumber-1.1.3[ruby_targets_ruby20] >=dev-ruby/rspec-2.6.0[ruby_targets_ruby20] >=dev-ruby/term-ansicolor-1.0.5[ruby_targets_ruby20] ) doc? ( >=dev-ruby/yard-0.8.3[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( dev-ruby/rake-compiler[ruby_targets_ruby21] dev-ruby/ruby-beautify[ruby_targets_ruby21] test? ( >=dev-ruby/builder-2.1.2[ruby_targets_ruby21] >=dev-util/cucumber-1.1.3[ruby_targets_ruby21] >=dev-ruby/rspec-2.6.0[ruby_targets_ruby21] >=dev-ruby/term-ansicolor-1.0.5[ruby_targets_ruby21] ) doc? ( >=dev-ruby/yard-0.8.3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( dev-ruby/rake-compiler[ruby_targets_ruby22] dev-ruby/ruby-beautify[ruby_targets_ruby22] test? ( >=dev-ruby/builder-2.1.2[ruby_targets_ruby22] >=dev-util/cucumber-1.1.3[ruby_targets_ruby22] >=dev-ruby/rspec-2.6.0[ruby_targets_ruby22] >=dev-ruby/term-ansicolor-1.0.5[ruby_targets_ruby22] ) doc? ( >=dev-ruby/yard-0.8.3[ruby_targets_ruby22] ) ) test? ( ruby_targets_ruby20? ( >=dev-ruby/multi_json-1.3[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/multi_json-1.3[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/multi_json-1.3[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] ) 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=Fast Gherkin lexer and parser based on Ragel
 EAPI=5
 HOMEPAGE=https://github.com/cucumber/gherkin
-IUSE=doc test test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc test
+IUSE=doc test test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc test
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc64 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/multi_json-1.3[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/multi_json-1.3[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/multi_json-1.3[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/multi_json-1.3[ruby_targets_ruby22] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) 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_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) 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_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
+RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/multi_json-1.3[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/multi_json-1.3[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/multi_json-1.3[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=https://github.com/cucumber/gherkin/archive/v2.12.2.tar.gz -> gherkin-2.12.2-git.tgz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	23ae8c186171e6476af098d2a50d0ee0	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=08c8616f4d8dd0e750cb2dda53b61380
+_md5_=88f5ff6ee95144ffb64103993d53af00
diff --git a/metadata/md5-cache/dev-ruby/hiera-1.3.4 b/metadata/md5-cache/dev-ruby/hiera-1.3.4
index 71bf3ee16b5b..9172a0ab204d 100644
--- a/metadata/md5-cache/dev-ruby/hiera-1.3.4
+++ b/metadata/md5-cache/dev-ruby/hiera-1.3.4
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby19? ( test? ( dev-ruby/mocha[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/mocha[ruby_targets_ruby20] ) ) test? ( ruby_targets_ruby19? ( dev-ruby/json[ruby_targets_ruby19] ) ruby_targets_ruby20? ( dev-ruby/json[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby20] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) )
+DEPEND=ruby_targets_ruby20? ( test? ( dev-ruby/mocha[ruby_targets_ruby20] ) ) test? ( ruby_targets_ruby20? ( dev-ruby/json[ruby_targets_ruby20] ) ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby20] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby20] ) ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) )
 DESCRIPTION=A simple pluggable Hierarchical Database
 EAPI=5
 HOMEPAGE=http://projects.puppetlabs.com/
-IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby20 test test
 KEYWORDS=amd64 hppa ppc sparc x86
 LICENSE=Apache-2.0
-RDEPEND=ruby_targets_ruby19? ( dev-ruby/json[ruby_targets_ruby19] ) ruby_targets_ruby20? ( dev-ruby/json[ruby_targets_ruby20] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
+RDEPEND=ruby_targets_ruby20? ( dev-ruby/json[ruby_targets_ruby20] ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
+REQUIRED_USE=|| ( ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/hiera-1.3.4.gem
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	23ae8c186171e6476af098d2a50d0ee0	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=ff3a3c98d52be0016706cfa988ab20aa
+_md5_=0493aaf6e5578ce90238d8734527ac40
diff --git a/metadata/md5-cache/dev-ruby/hiera-1.3.4-r1 b/metadata/md5-cache/dev-ruby/hiera-1.3.4-r1
index 83876136f543..155bea5fc2f0 100644
--- a/metadata/md5-cache/dev-ruby/hiera-1.3.4-r1
+++ b/metadata/md5-cache/dev-ruby/hiera-1.3.4-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby19? ( test? ( dev-ruby/mocha[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/mocha[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/mocha[ruby_targets_ruby21] ) ) test? ( ruby_targets_ruby19? ( dev-ruby/json[ruby_targets_ruby19] ) ruby_targets_ruby20? ( dev-ruby/json[ruby_targets_ruby20] ) ruby_targets_ruby21? ( dev-ruby/json[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby19] ) ) 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_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) )
+DEPEND=ruby_targets_ruby20? ( test? ( dev-ruby/mocha[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/mocha[ruby_targets_ruby21] ) ) test? ( ruby_targets_ruby20? ( dev-ruby/json[ruby_targets_ruby20] ) ruby_targets_ruby21? ( dev-ruby/json[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 simple pluggable Hierarchical Database
 EAPI=5
 HOMEPAGE=http://projects.puppetlabs.com/
-IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 test test
 KEYWORDS=~amd64 ~hppa ~ppc ~sparc ~x86
 LICENSE=Apache-2.0
-RDEPEND=ruby_targets_ruby19? ( dev-ruby/json[ruby_targets_ruby19] ) ruby_targets_ruby20? ( dev-ruby/json[ruby_targets_ruby20] ) ruby_targets_ruby21? ( dev-ruby/json[ruby_targets_ruby21] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
+RDEPEND=ruby_targets_ruby20? ( dev-ruby/json[ruby_targets_ruby20] ) ruby_targets_ruby21? ( dev-ruby/json[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/hiera-1.3.4.gem
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	23ae8c186171e6476af098d2a50d0ee0	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=d509c17e984b74ff4286ecd9d9cd415d
+_md5_=32063552cae6731dedc5a1b856a839be
diff --git a/metadata/md5-cache/dev-ruby/hiera-2.0.0 b/metadata/md5-cache/dev-ruby/hiera-2.0.0
index dab0aa7d5c44..56f16f2ac1a7 100644
--- a/metadata/md5-cache/dev-ruby/hiera-2.0.0
+++ b/metadata/md5-cache/dev-ruby/hiera-2.0.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby19? ( test? ( dev-ruby/mocha[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/mocha[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/mocha[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/mocha[ruby_targets_ruby22] ) ) test? ( ruby_targets_ruby19? ( dev-ruby/json[ruby_targets_ruby19] ) ruby_targets_ruby20? ( dev-ruby/json[ruby_targets_ruby20] ) ruby_targets_ruby21? ( dev-ruby/json[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/json[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) 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_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby19] ) ) 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_ruby22? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby22] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) 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_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
+DEPEND=ruby_targets_ruby20? ( test? ( dev-ruby/mocha[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/mocha[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/mocha[ruby_targets_ruby22] ) ) test? ( ruby_targets_ruby20? ( dev-ruby/json[ruby_targets_ruby20] ) ruby_targets_ruby21? ( dev-ruby/json[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/json[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: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_ruby22? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby22] >=dev-ruby/rspec-core-2.14.8-r2[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=A simple pluggable Hierarchical Database
 EAPI=5
 HOMEPAGE=http://projects.puppetlabs.com/
-IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 test test
 KEYWORDS=~amd64 ~hppa ~ppc ~sparc ~x86
 LICENSE=Apache-2.0
-RDEPEND=ruby_targets_ruby19? ( dev-ruby/json[ruby_targets_ruby19] ) ruby_targets_ruby20? ( dev-ruby/json[ruby_targets_ruby20] ) ruby_targets_ruby21? ( dev-ruby/json[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/json[ruby_targets_ruby22] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) 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_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) 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_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
+RDEPEND=ruby_targets_ruby20? ( dev-ruby/json[ruby_targets_ruby20] ) ruby_targets_ruby21? ( dev-ruby/json[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/json[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/hiera-2.0.0.gem
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	23ae8c186171e6476af098d2a50d0ee0	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=5bdc575eae7358dc192a0e240c0fedff
+_md5_=e4c3b2d90e1e83faa5054fb6d3e248dc
diff --git a/metadata/md5-cache/dev-ruby/hiera-3.0.1-r1 b/metadata/md5-cache/dev-ruby/hiera-3.0.1-r1
index 28dd4e75832d..48496f4ae311 100644
--- a/metadata/md5-cache/dev-ruby/hiera-3.0.1-r1
+++ b/metadata/md5-cache/dev-ruby/hiera-3.0.1-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby19? ( test? ( dev-ruby/mocha[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/mocha[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/mocha[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/mocha[ruby_targets_ruby22] ) ) test? ( ruby_targets_ruby19? ( dev-ruby/json[ruby_targets_ruby19] dev-ruby/deep_merge[ruby_targets_ruby19] ) ruby_targets_ruby20? ( dev-ruby/json[ruby_targets_ruby20] dev-ruby/deep_merge[ruby_targets_ruby20] ) ruby_targets_ruby21? ( dev-ruby/json[ruby_targets_ruby21] dev-ruby/deep_merge[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/json[ruby_targets_ruby22] dev-ruby/deep_merge[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) 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_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby19] ) ) 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_ruby22? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby22] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) 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_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
+DEPEND=ruby_targets_ruby20? ( test? ( dev-ruby/mocha[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/mocha[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/mocha[ruby_targets_ruby22] ) ) test? ( ruby_targets_ruby20? ( dev-ruby/json[ruby_targets_ruby20] dev-ruby/deep_merge[ruby_targets_ruby20] ) ruby_targets_ruby21? ( dev-ruby/json[ruby_targets_ruby21] dev-ruby/deep_merge[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/json[ruby_targets_ruby22] dev-ruby/deep_merge[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: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_ruby22? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby22] >=dev-ruby/rspec-core-2.14.8-r2[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=A simple pluggable Hierarchical Database
 EAPI=5
 HOMEPAGE=http://projects.puppetlabs.com/
-IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 test test
 KEYWORDS=~amd64 ~hppa ~x86
 LICENSE=Apache-2.0
-RDEPEND=ruby_targets_ruby19? ( dev-ruby/json[ruby_targets_ruby19] dev-ruby/deep_merge[ruby_targets_ruby19] ) ruby_targets_ruby20? ( dev-ruby/json[ruby_targets_ruby20] dev-ruby/deep_merge[ruby_targets_ruby20] ) ruby_targets_ruby21? ( dev-ruby/json[ruby_targets_ruby21] dev-ruby/deep_merge[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/json[ruby_targets_ruby22] dev-ruby/deep_merge[ruby_targets_ruby22] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) 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_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) 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_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
+RDEPEND=ruby_targets_ruby20? ( dev-ruby/json[ruby_targets_ruby20] dev-ruby/deep_merge[ruby_targets_ruby20] ) ruby_targets_ruby21? ( dev-ruby/json[ruby_targets_ruby21] dev-ruby/deep_merge[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/json[ruby_targets_ruby22] dev-ruby/deep_merge[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/hiera-3.0.1.gem
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	23ae8c186171e6476af098d2a50d0ee0	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=cf332cda26cde537edb2bc959529b9d8
+_md5_=d130b8a9151a7ad2dabc427f45e27ad9
diff --git a/metadata/md5-cache/dev-ruby/hiera-eyaml-gpg-0.4 b/metadata/md5-cache/dev-ruby/hiera-eyaml-gpg-0.4
index 3d72d3e5d293..295f35e65c07 100644
--- a/metadata/md5-cache/dev-ruby/hiera-eyaml-gpg-0.4
+++ b/metadata/md5-cache/dev-ruby/hiera-eyaml-gpg-0.4
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby19? ( >=dev-ruby/hiera-eyaml-1.3.8[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/hiera-eyaml-1.3.8[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/hiera-eyaml-1.3.8[ruby_targets_ruby21] ) ) test? ( ruby_targets_ruby19? ( >=dev-ruby/gpgme-2.0.0[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/gpgme-2.0.0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/gpgme-2.0.0[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) )
+DEPEND=test? ( ruby_targets_ruby20? ( >=dev-ruby/hiera-eyaml-1.3.8[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/hiera-eyaml-1.3.8[ruby_targets_ruby21] ) ) test? ( ruby_targets_ruby20? ( >=dev-ruby/gpgme-2.0.0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/gpgme-2.0.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] ) )
 DESCRIPTION=A GPG backend for hiera-eyaml
 EAPI=5
 HOMEPAGE=https://github.com/sihil/hiera-eyaml-gpg
-IUSE=test test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 test test
+IUSE=test test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 test test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/hiera-eyaml-1.3.8[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/hiera-eyaml-1.3.8[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/hiera-eyaml-1.3.8[ruby_targets_ruby21] ) ruby_targets_ruby19? ( >=dev-ruby/gpgme-2.0.0[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/gpgme-2.0.0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/gpgme-2.0.0[ruby_targets_ruby21] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
+RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/hiera-eyaml-1.3.8[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/hiera-eyaml-1.3.8[ruby_targets_ruby21] ) ruby_targets_ruby20? ( >=dev-ruby/gpgme-2.0.0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/gpgme-2.0.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 )
 SLOT=0
 SRC_URI=mirror://rubygems/hiera-eyaml-gpg-0.4.gem
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	23ae8c186171e6476af098d2a50d0ee0	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=1ace531c877a1b1401310ae6420acc3e
+_md5_=146f5c3eb27b66b9ef2ccae55259a3f3
diff --git a/metadata/md5-cache/dev-ruby/hiera-eyaml-gpg-0.5 b/metadata/md5-cache/dev-ruby/hiera-eyaml-gpg-0.5
index e7048ef9687a..6479890a7cc5 100644
--- a/metadata/md5-cache/dev-ruby/hiera-eyaml-gpg-0.5
+++ b/metadata/md5-cache/dev-ruby/hiera-eyaml-gpg-0.5
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby19? ( >=dev-ruby/hiera-eyaml-1.3.8[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/hiera-eyaml-1.3.8[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/hiera-eyaml-1.3.8[ruby_targets_ruby21] ) ) test? ( ruby_targets_ruby19? ( >=dev-ruby/gpgme-2.0.0[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/gpgme-2.0.0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/gpgme-2.0.0[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) )
+DEPEND=test? ( ruby_targets_ruby20? ( >=dev-ruby/hiera-eyaml-1.3.8[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/hiera-eyaml-1.3.8[ruby_targets_ruby21] ) ) test? ( ruby_targets_ruby20? ( >=dev-ruby/gpgme-2.0.0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/gpgme-2.0.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] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) )
 DESCRIPTION=A GPG backend for hiera-eyaml
 EAPI=5
 HOMEPAGE=https://github.com/sihil/hiera-eyaml-gpg
-IUSE=test test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 test
+IUSE=test test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/hiera-eyaml-1.3.8[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/hiera-eyaml-1.3.8[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/hiera-eyaml-1.3.8[ruby_targets_ruby21] ) ruby_targets_ruby19? ( >=dev-ruby/gpgme-2.0.0[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/gpgme-2.0.0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/gpgme-2.0.0[ruby_targets_ruby21] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
+RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/hiera-eyaml-1.3.8[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/hiera-eyaml-1.3.8[ruby_targets_ruby21] ) ruby_targets_ruby20? ( >=dev-ruby/gpgme-2.0.0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/gpgme-2.0.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 )
 SLOT=0
 SRC_URI=mirror://rubygems/hiera-eyaml-gpg-0.5.gem
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	23ae8c186171e6476af098d2a50d0ee0	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=c3391e07de5a5cf08dd47e319b7ea754
+_md5_=fdb086a2fc22d550afdc732a918ba26b
diff --git a/metadata/md5-cache/dev-ruby/hiera-eyaml-gpg-0.6 b/metadata/md5-cache/dev-ruby/hiera-eyaml-gpg-0.6
index 0aa0471e74ac..06484c2c9d57 100644
--- a/metadata/md5-cache/dev-ruby/hiera-eyaml-gpg-0.6
+++ b/metadata/md5-cache/dev-ruby/hiera-eyaml-gpg-0.6
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby19? ( >=dev-ruby/hiera-eyaml-1.3.8[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/hiera-eyaml-1.3.8[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/hiera-eyaml-1.3.8[ruby_targets_ruby21] ) ) test? ( ruby_targets_ruby19? ( >=dev-ruby/gpgme-2.0.0[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/gpgme-2.0.0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/gpgme-2.0.0[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) )
+DEPEND=test? ( ruby_targets_ruby20? ( >=dev-ruby/hiera-eyaml-1.3.8[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/hiera-eyaml-1.3.8[ruby_targets_ruby21] ) ) test? ( ruby_targets_ruby20? ( >=dev-ruby/gpgme-2.0.0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/gpgme-2.0.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] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) )
 DESCRIPTION=A GPG backend for hiera-eyaml
 EAPI=5
 HOMEPAGE=https://github.com/sihil/hiera-eyaml-gpg
-IUSE=test test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 test
+IUSE=test test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/hiera-eyaml-1.3.8[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/hiera-eyaml-1.3.8[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/hiera-eyaml-1.3.8[ruby_targets_ruby21] ) ruby_targets_ruby19? ( >=dev-ruby/gpgme-2.0.0[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/gpgme-2.0.0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/gpgme-2.0.0[ruby_targets_ruby21] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
+RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/hiera-eyaml-1.3.8[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/hiera-eyaml-1.3.8[ruby_targets_ruby21] ) ruby_targets_ruby20? ( >=dev-ruby/gpgme-2.0.0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/gpgme-2.0.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 )
 SLOT=0
 SRC_URI=mirror://rubygems/hiera-eyaml-gpg-0.6.gem
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	23ae8c186171e6476af098d2a50d0ee0	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=c3391e07de5a5cf08dd47e319b7ea754
+_md5_=fdb086a2fc22d550afdc732a918ba26b
diff --git a/metadata/md5-cache/dev-ruby/hike-1.2.3 b/metadata/md5-cache/dev-ruby/hike-1.2.3
index 25dad2c0337a..13e0a38990c4 100644
--- a/metadata/md5-cache/dev-ruby/hike-1.2.3
+++ b/metadata/md5-cache/dev-ruby/hike-1.2.3
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) )
+DEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) )
 DESCRIPTION=Hike is a Ruby library for finding files in a set of paths
 EAPI=5
 HOMEPAGE=https://github.com/sstephenson/hike
-IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby20 test test
 KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
+RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
+REQUIRED_USE=|| ( ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=https://github.com/sstephenson/hike/archive/v1.2.3.tar.gz -> hike-1.2.3.tgz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	23ae8c186171e6476af098d2a50d0ee0	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=96851a5634f171d46f18dd035cdad514
+_md5_=e592fd9c178f4b85a8bf65e7115ea361
diff --git a/metadata/md5-cache/dev-ruby/hike-1.2.3-r1 b/metadata/md5-cache/dev-ruby/hike-1.2.3-r1
index 951f1b626b17..9c20f79eccaa 100644
--- a/metadata/md5-cache/dev-ruby/hike-1.2.3-r1
+++ b/metadata/md5-cache/dev-ruby/hike-1.2.3-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) 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_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) 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_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
+DEPEND=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/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[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=Hike is a Ruby library for finding files in a set of paths
 EAPI=5
 HOMEPAGE=https://github.com/sstephenson/hike
-IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 test test
 KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) 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_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) 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_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
+RDEPEND=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=https://github.com/sstephenson/hike/archive/v1.2.3.tar.gz -> hike-1.2.3.tgz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	23ae8c186171e6476af098d2a50d0ee0	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=c9f415d6decce1b4edec07f766d3fd64
+_md5_=b24ec8cb862971e05f9e38c4a9357fc4
diff --git a/metadata/md5-cache/dev-ruby/hike-2.1.2 b/metadata/md5-cache/dev-ruby/hike-2.1.2
index 506eb8022612..353044ad33e3 100644
--- a/metadata/md5-cache/dev-ruby/hike-2.1.2
+++ b/metadata/md5-cache/dev-ruby/hike-2.1.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby19? ( test? ( dev-ruby/minitest[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/minitest[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/minitest[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) 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_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) 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_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
+DEPEND=ruby_targets_ruby20? ( test? ( dev-ruby/minitest[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/minitest[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest[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/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[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=Hike is a Ruby library for finding files in a set of paths
 EAPI=5
 HOMEPAGE=https://github.com/sstephenson/hike
-IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 test test
 KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) 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_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) 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_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
+RDEPEND=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=2
 SRC_URI=https://github.com/sstephenson/hike/archive/v2.1.2.tar.gz -> hike-2.1.2.tgz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	23ae8c186171e6476af098d2a50d0ee0	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=38ab090cc073f5b095196cc5a6db8393
+_md5_=eb674d6f2c8d61029a7355fca705b810
diff --git a/metadata/md5-cache/dev-ruby/hipchat-1.5.2 b/metadata/md5-cache/dev-ruby/hipchat-1.5.2
index 4bcfce7fa064..9f9192487e3c 100644
--- a/metadata/md5-cache/dev-ruby/hipchat-1.5.2
+++ b/metadata/md5-cache/dev-ruby/hipchat-1.5.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby19? ( dev-ruby/httparty[ruby_targets_ruby19] dev-ruby/mimemagic[ruby_targets_ruby19] ) ruby_targets_ruby20? ( dev-ruby/httparty[ruby_targets_ruby20] dev-ruby/mimemagic[ruby_targets_ruby20] ) ruby_targets_ruby21? ( dev-ruby/httparty[ruby_targets_ruby21] dev-ruby/mimemagic[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rr[ruby_targets_ruby19] dev-ruby/rake[ruby_targets_ruby19] dev-ruby/webmock[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rr[ruby_targets_ruby20] dev-ruby/rake[ruby_targets_ruby20] dev-ruby/webmock[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rr[ruby_targets_ruby21] dev-ruby/rake[ruby_targets_ruby21] dev-ruby/webmock[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) )
+DEPEND=test? ( ruby_targets_ruby20? ( dev-ruby/httparty[ruby_targets_ruby20] dev-ruby/mimemagic[ruby_targets_ruby20] ) ruby_targets_ruby21? ( dev-ruby/httparty[ruby_targets_ruby21] dev-ruby/mimemagic[ruby_targets_ruby21] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rr[ruby_targets_ruby20] dev-ruby/rake[ruby_targets_ruby20] dev-ruby/webmock[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rr[ruby_targets_ruby21] dev-ruby/rake[ruby_targets_ruby21] dev-ruby/webmock[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/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=Ruby library to interact with HipChat
 EAPI=5
 HOMEPAGE=https://github.com/hipchat/hipchat-rb
-IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby19? ( dev-ruby/httparty[ruby_targets_ruby19] dev-ruby/mimemagic[ruby_targets_ruby19] ) ruby_targets_ruby20? ( dev-ruby/httparty[ruby_targets_ruby20] dev-ruby/mimemagic[ruby_targets_ruby20] ) ruby_targets_ruby21? ( dev-ruby/httparty[ruby_targets_ruby21] dev-ruby/mimemagic[ruby_targets_ruby21] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
+RDEPEND=ruby_targets_ruby20? ( dev-ruby/httparty[ruby_targets_ruby20] dev-ruby/mimemagic[ruby_targets_ruby20] ) ruby_targets_ruby21? ( dev-ruby/httparty[ruby_targets_ruby21] dev-ruby/mimemagic[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=https://github.com/hipchat/hipchat-rb/archive/1.5.2.tar.gz -> hipchat-1.5.2.tar.gz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	23ae8c186171e6476af098d2a50d0ee0	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=9bed31a44102024cb876cd4619f1ae62
+_md5_=c329f4c3ceb36a60c38817b47bc32125
diff --git a/metadata/md5-cache/dev-ruby/hitimes-1.2.2 b/metadata/md5-cache/dev-ruby/hitimes-1.2.2
index 220a6125a66a..8467a5b28b94 100644
--- a/metadata/md5-cache/dev-ruby/hitimes-1.2.2
+++ b/metadata/md5-cache/dev-ruby/hitimes-1.2.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) 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_ruby19? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) 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_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
+DEPEND=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? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[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=A fast, high resolution timer library
 EAPI=5
 HOMEPAGE=https://github.com/copiousfreetime/hitimes
-IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc test test
 KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=ISC
-RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) 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_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) 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_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
+RDEPEND=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/hitimes-1.2.2.gem
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	23ae8c186171e6476af098d2a50d0ee0	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=09b2456f45da6f42fcc115c0ed236bc6
+_md5_=74a9c1d0267754f2285bb188f7364c38
diff --git a/metadata/md5-cache/dev-ruby/hitimes-1.2.3 b/metadata/md5-cache/dev-ruby/hitimes-1.2.3
index 5047a898aa47..7f1e506f8c7d 100644
--- a/metadata/md5-cache/dev-ruby/hitimes-1.2.3
+++ b/metadata/md5-cache/dev-ruby/hitimes-1.2.3
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) 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_ruby19? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) 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_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
+DEPEND=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? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[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=A fast, high resolution timer library
 EAPI=5
 HOMEPAGE=https://github.com/copiousfreetime/hitimes
-IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc test test
 KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=ISC
-RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) 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_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) 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_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
+RDEPEND=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/hitimes-1.2.3.gem
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	23ae8c186171e6476af098d2a50d0ee0	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=09b2456f45da6f42fcc115c0ed236bc6
+_md5_=74a9c1d0267754f2285bb188f7364c38
diff --git a/metadata/md5-cache/dev-ruby/http-form_data-1.0.1 b/metadata/md5-cache/dev-ruby/http-form_data-1.0.1
index 3c39fa818b95..ad909b85f7ca 100644
--- a/metadata/md5-cache/dev-ruby/http-form_data-1.0.1
+++ b/metadata/md5-cache/dev-ruby/http-form_data-1.0.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) 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_ruby19? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby19] ) ) 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_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) 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_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
+DEPEND=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? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) 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=Utility-belt to build form data request bodies
 EAPI=5
 HOMEPAGE=https://github.com/httprb/form_data.rb
-IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc test test
 KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) 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_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) 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_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
+RDEPEND=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=1.0
 SRC_URI=mirror://rubygems/http-form_data-1.0.1.gem
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	23ae8c186171e6476af098d2a50d0ee0	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=7eb3fc33afdfcf5df79e1ee1a81ee9f4
+_md5_=39b790e896dcc0a3c56f77665daac54d
diff --git a/metadata/md5-cache/dev-ruby/i18n-0.7.0-r2 b/metadata/md5-cache/dev-ruby/i18n-0.7.0-r2
new file mode 100644
index 000000000000..ce1cba46f9d8
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/i18n-0.7.0-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby20? ( test? ( >=dev-ruby/activesupport-3.2[ruby_targets_ruby20] <dev-ruby/activesupport-4.3[ruby_targets_ruby20] dev-ruby/bundler[ruby_targets_ruby20] >=dev-ruby/mocha-0.13[ruby_targets_ruby20] dev-ruby/test_declarative[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/activesupport-3.2[ruby_targets_ruby21] <dev-ruby/activesupport-4.3[ruby_targets_ruby21] dev-ruby/bundler[ruby_targets_ruby21] >=dev-ruby/mocha-0.13[ruby_targets_ruby21] dev-ruby/test_declarative[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/activesupport-3.2[ruby_targets_ruby22] <dev-ruby/activesupport-4.3[ruby_targets_ruby22] dev-ruby/bundler[ruby_targets_ruby22] >=dev-ruby/mocha-0.13[ruby_targets_ruby22] dev-ruby/test_declarative[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/activesupport-3.2[ruby_targets_ruby23] <dev-ruby/activesupport-4.3[ruby_targets_ruby23] dev-ruby/bundler[ruby_targets_ruby23] >=dev-ruby/mocha-0.13[ruby_targets_ruby23] dev-ruby/test_declarative[ruby_targets_ruby23] ) ) 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_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby20? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) 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_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) 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_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) 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=Add Internationalization support to your Ruby application
+EAPI=5
+HOMEPAGE=http://rails-i18n.org/
+IUSE=elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=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_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) 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_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
+SLOT=0.7
+SRC_URI=https://github.com/svenfuchs/i18n/archive/v0.7.0.tar.gz -> i18n-0.7.0.tar.gz
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	23ae8c186171e6476af098d2a50d0ee0	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=3458ee212cacdb004e669c193265c259
diff --git a/metadata/md5-cache/dev-ruby/jsobfu-0.2.1 b/metadata/md5-cache/dev-ruby/jsobfu-0.2.1
index 2c05caf9e564..921262326c18 100644
--- a/metadata/md5-cache/dev-ruby/jsobfu-0.2.1
+++ b/metadata/md5-cache/dev-ruby/jsobfu-0.2.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby19? ( >=dev-ruby/rkelly-remix-0.0.6:0[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/rkelly-remix-0.0.6:0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/rkelly-remix-0.0.6:0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/rkelly-remix-0.0.6:0[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) 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_ruby19? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby19] ) ) 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_ruby22? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby22] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) 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_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
+DEPEND=test? ( ruby_targets_ruby20? ( >=dev-ruby/rkelly-remix-0.0.6:0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/rkelly-remix-0.0.6:0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/rkelly-remix-0.0.6:0[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? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) 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_ruby22? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby22] >=dev-ruby/rspec-core-2.14.8-r2[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=A Javascript code obfuscator
 EAPI=5
 HOMEPAGE=https://github.com/rapid7/jsobfu
-IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc test test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=BSD
-RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/rkelly-remix-0.0.6:0[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/rkelly-remix-0.0.6:0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/rkelly-remix-0.0.6:0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/rkelly-remix-0.0.6:0[ruby_targets_ruby22] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) 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_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) 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_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
+RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/rkelly-remix-0.0.6:0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/rkelly-remix-0.0.6:0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/rkelly-remix-0.0.6:0[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/jsobfu-0.2.1.gem
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	23ae8c186171e6476af098d2a50d0ee0	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=646f53fb072024e21f56001ee0944831
+_md5_=37c11819bab19d1bbb08c814a6dec47e
diff --git a/metadata/md5-cache/dev-ruby/jsobfu-0.2.1-r1 b/metadata/md5-cache/dev-ruby/jsobfu-0.2.1-r1
index 6136a36b8022..555f6255c897 100644
--- a/metadata/md5-cache/dev-ruby/jsobfu-0.2.1-r1
+++ b/metadata/md5-cache/dev-ruby/jsobfu-0.2.1-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby19? ( !dev-ruby/jsobfu:0[ruby_targets_ruby19] >=dev-ruby/rkelly-remix-0.0.6:0[ruby_targets_ruby19] ) ruby_targets_ruby20? ( !dev-ruby/jsobfu:0[ruby_targets_ruby20] >=dev-ruby/rkelly-remix-0.0.6:0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( !dev-ruby/jsobfu:0[ruby_targets_ruby21] >=dev-ruby/rkelly-remix-0.0.6:0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( !dev-ruby/jsobfu:0[ruby_targets_ruby22] >=dev-ruby/rkelly-remix-0.0.6:0[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) 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_ruby19? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby19] ) ) 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_ruby22? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby22] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) 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_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
+DEPEND=test? ( ruby_targets_ruby20? ( !dev-ruby/jsobfu:0[ruby_targets_ruby20] >=dev-ruby/rkelly-remix-0.0.6:0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( !dev-ruby/jsobfu:0[ruby_targets_ruby21] >=dev-ruby/rkelly-remix-0.0.6:0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( !dev-ruby/jsobfu:0[ruby_targets_ruby22] >=dev-ruby/rkelly-remix-0.0.6:0[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? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) 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_ruby22? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby22] >=dev-ruby/rspec-core-2.14.8-r2[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=A Javascript code obfuscator
 EAPI=5
 HOMEPAGE=https://github.com/rapid7/jsobfu
-IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc test test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=BSD
-RDEPEND=ruby_targets_ruby19? ( !dev-ruby/jsobfu:0[ruby_targets_ruby19] >=dev-ruby/rkelly-remix-0.0.6:0[ruby_targets_ruby19] ) ruby_targets_ruby20? ( !dev-ruby/jsobfu:0[ruby_targets_ruby20] >=dev-ruby/rkelly-remix-0.0.6:0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( !dev-ruby/jsobfu:0[ruby_targets_ruby21] >=dev-ruby/rkelly-remix-0.0.6:0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( !dev-ruby/jsobfu:0[ruby_targets_ruby22] >=dev-ruby/rkelly-remix-0.0.6:0[ruby_targets_ruby22] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) 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_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) 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_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
+RDEPEND=ruby_targets_ruby20? ( !dev-ruby/jsobfu:0[ruby_targets_ruby20] >=dev-ruby/rkelly-remix-0.0.6:0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( !dev-ruby/jsobfu:0[ruby_targets_ruby21] >=dev-ruby/rkelly-remix-0.0.6:0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( !dev-ruby/jsobfu:0[ruby_targets_ruby22] >=dev-ruby/rkelly-remix-0.0.6:0[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.2.1
 SRC_URI=mirror://rubygems/jsobfu-0.2.1.gem
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	23ae8c186171e6476af098d2a50d0ee0	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=ddf42e140c612f4bd2639d5dc23f765d
+_md5_=3234dc6f29007585efbef5b9d8f46f2e
diff --git a/metadata/md5-cache/dev-ruby/jsobfu-0.3.0 b/metadata/md5-cache/dev-ruby/jsobfu-0.3.0
index bbf49249323c..b7e1841ff964 100644
--- a/metadata/md5-cache/dev-ruby/jsobfu-0.3.0
+++ b/metadata/md5-cache/dev-ruby/jsobfu-0.3.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby19? ( >=dev-ruby/rkelly-remix-0.0.6:0[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/rkelly-remix-0.0.6:0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/rkelly-remix-0.0.6:0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/rkelly-remix-0.0.6:0[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/execjs[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/execjs[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/execjs[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/execjs[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) 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_ruby19? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby19] ) ) 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_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) 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_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
+DEPEND=test? ( ruby_targets_ruby20? ( >=dev-ruby/rkelly-remix-0.0.6:0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/rkelly-remix-0.0.6:0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/rkelly-remix-0.0.6:0[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/execjs[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/execjs[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/execjs[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? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) 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=A Javascript code obfuscator
 EAPI=5
 HOMEPAGE=https://github.com/rapid7/jsobfu
-IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc test test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=BSD
-RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/rkelly-remix-0.0.6:0[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/rkelly-remix-0.0.6:0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/rkelly-remix-0.0.6:0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/rkelly-remix-0.0.6:0[ruby_targets_ruby22] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) 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_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) 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_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
+RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/rkelly-remix-0.0.6:0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/rkelly-remix-0.0.6:0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/rkelly-remix-0.0.6:0[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/jsobfu-0.3.0.gem
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	23ae8c186171e6476af098d2a50d0ee0	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=6967065e8547ac6767ff38dcc3f0cb8a
+_md5_=500c47e25f86739e3399a5cb517aae3e
diff --git a/metadata/md5-cache/dev-ruby/jsobfu-0.3.0-r1 b/metadata/md5-cache/dev-ruby/jsobfu-0.3.0-r1
index d6a116e50944..7abff943cf10 100644
--- a/metadata/md5-cache/dev-ruby/jsobfu-0.3.0-r1
+++ b/metadata/md5-cache/dev-ruby/jsobfu-0.3.0-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby19? ( !dev-ruby/jsobfu:0[ruby_targets_ruby19] >=dev-ruby/rkelly-remix-0.0.6:0[ruby_targets_ruby19] ) ruby_targets_ruby20? ( !dev-ruby/jsobfu:0[ruby_targets_ruby20] >=dev-ruby/rkelly-remix-0.0.6:0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( !dev-ruby/jsobfu:0[ruby_targets_ruby21] >=dev-ruby/rkelly-remix-0.0.6:0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( !dev-ruby/jsobfu:0[ruby_targets_ruby22] >=dev-ruby/rkelly-remix-0.0.6:0[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/execjs[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/execjs[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/execjs[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/execjs[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) 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_ruby19? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby19] ) ) 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_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) 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_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
+DEPEND=test? ( ruby_targets_ruby20? ( !dev-ruby/jsobfu:0[ruby_targets_ruby20] >=dev-ruby/rkelly-remix-0.0.6:0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( !dev-ruby/jsobfu:0[ruby_targets_ruby21] >=dev-ruby/rkelly-remix-0.0.6:0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( !dev-ruby/jsobfu:0[ruby_targets_ruby22] >=dev-ruby/rkelly-remix-0.0.6:0[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/execjs[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/execjs[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/execjs[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? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) 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=A Javascript code obfuscator
 EAPI=5
 HOMEPAGE=https://github.com/rapid7/jsobfu
-IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc test test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=BSD
-RDEPEND=ruby_targets_ruby19? ( !dev-ruby/jsobfu:0[ruby_targets_ruby19] >=dev-ruby/rkelly-remix-0.0.6:0[ruby_targets_ruby19] ) ruby_targets_ruby20? ( !dev-ruby/jsobfu:0[ruby_targets_ruby20] >=dev-ruby/rkelly-remix-0.0.6:0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( !dev-ruby/jsobfu:0[ruby_targets_ruby21] >=dev-ruby/rkelly-remix-0.0.6:0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( !dev-ruby/jsobfu:0[ruby_targets_ruby22] >=dev-ruby/rkelly-remix-0.0.6:0[ruby_targets_ruby22] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) 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_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) 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_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
+RDEPEND=ruby_targets_ruby20? ( !dev-ruby/jsobfu:0[ruby_targets_ruby20] >=dev-ruby/rkelly-remix-0.0.6:0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( !dev-ruby/jsobfu:0[ruby_targets_ruby21] >=dev-ruby/rkelly-remix-0.0.6:0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( !dev-ruby/jsobfu:0[ruby_targets_ruby22] >=dev-ruby/rkelly-remix-0.0.6:0[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.3.0
 SRC_URI=mirror://rubygems/jsobfu-0.3.0.gem
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	23ae8c186171e6476af098d2a50d0ee0	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=d4f7e5a5708700b35ac8afb59bedb5bc
+_md5_=cfe185291c609fc0591168a35224bbd3
diff --git a/metadata/md5-cache/dev-ruby/liquid-2.6.2 b/metadata/md5-cache/dev-ruby/liquid-2.6.2
index f915d3a9e754..3d2930916fed 100644
--- a/metadata/md5-cache/dev-ruby/liquid-2.6.2
+++ b/metadata/md5-cache/dev-ruby/liquid-2.6.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby19? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) 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_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) 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_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
+DEPEND=ruby_targets_ruby20? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[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] ) 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=Template engine for Ruby
 EAPI=5
 HOMEPAGE=http://www.liquidmarkup.org/
-IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 test
+IUSE=elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 test
 KEYWORDS=~amd64 ~x86 ~x86-fbsd
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) 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_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) 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_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
+RDEPEND=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/liquid-2.6.2.gem
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	23ae8c186171e6476af098d2a50d0ee0	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=4c1834e1e28dff1380158ff3a06ed96b
+_md5_=9b00383e6e41b14c864beb44ad50b161
diff --git a/metadata/md5-cache/dev-ruby/liquid-3.0.4 b/metadata/md5-cache/dev-ruby/liquid-3.0.4
index 34b4d2f986a2..b5399a7c40a9 100644
--- a/metadata/md5-cache/dev-ruby/liquid-3.0.4
+++ b/metadata/md5-cache/dev-ruby/liquid-3.0.4
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby19? ( test? ( dev-ruby/minitest[ruby_targets_ruby19] dev-ruby/spy[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/minitest[ruby_targets_ruby20] dev-ruby/spy[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/minitest[ruby_targets_ruby21] dev-ruby/spy[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) )
+DEPEND=ruby_targets_ruby20? ( test? ( dev-ruby/minitest[ruby_targets_ruby20] dev-ruby/spy[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/minitest[ruby_targets_ruby21] dev-ruby/spy[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] ) )
 DESCRIPTION=Template engine for Ruby
 EAPI=5
 HOMEPAGE=http://www.liquidmarkup.org/
-IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
+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=3
 SRC_URI=https://github.com/Shopify/liquid/archive/v3.0.4.tar.gz -> liquid-3.0.4.tar.gz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	23ae8c186171e6476af098d2a50d0ee0	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=f171bc13612db25e5a166ebde763c230
+_md5_=9d6b218edba61e8d1c325ebd6c96409d
diff --git a/metadata/md5-cache/dev-ruby/liquid-3.0.6 b/metadata/md5-cache/dev-ruby/liquid-3.0.6
index 8399bcbc5cd6..17a5ed544560 100644
--- a/metadata/md5-cache/dev-ruby/liquid-3.0.6
+++ b/metadata/md5-cache/dev-ruby/liquid-3.0.6
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby19? ( test? ( dev-ruby/minitest[ruby_targets_ruby19] dev-ruby/spy[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/minitest[ruby_targets_ruby20] dev-ruby/spy[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/minitest[ruby_targets_ruby21] dev-ruby/spy[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) )
+DEPEND=ruby_targets_ruby20? ( test? ( dev-ruby/minitest[ruby_targets_ruby20] dev-ruby/spy[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/minitest[ruby_targets_ruby21] dev-ruby/spy[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] ) )
 DESCRIPTION=Template engine for Ruby
 EAPI=5
 HOMEPAGE=http://www.liquidmarkup.org/
-IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
+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=3
 SRC_URI=https://github.com/Shopify/liquid/archive/v3.0.6.tar.gz -> liquid-3.0.6.tar.gz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	23ae8c186171e6476af098d2a50d0ee0	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=f171bc13612db25e5a166ebde763c230
+_md5_=9d6b218edba61e8d1c325ebd6c96409d
diff --git a/metadata/md5-cache/dev-ruby/listen-0.7.3-r1 b/metadata/md5-cache/dev-ruby/listen-0.7.3-r1
index d250c2addd49..ecd99bc55b04 100644
--- a/metadata/md5-cache/dev-ruby/listen-0.7.3-r1
+++ b/metadata/md5-cache/dev-ruby/listen-0.7.3-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby19? ( >=dev-ruby/rb-inotify-0.9.0[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/rb-inotify-0.9.0[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby20] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) )
+DEPEND=test? ( ruby_targets_ruby20? ( >=dev-ruby/rb-inotify-0.9.0[ruby_targets_ruby20] ) ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby20] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby20] ) ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) )
 DESCRIPTION=Listens to file modifications and notifies you about the changes
 EAPI=5
 HOMEPAGE=https://github.com/guard/listen
-IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby20 test test
 KEYWORDS=amd64 ~arm ~ppc ~ppc64 x86 ~x64-macos
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/rb-inotify-0.9.0[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/rb-inotify-0.9.0[ruby_targets_ruby20] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
+RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/rb-inotify-0.9.0[ruby_targets_ruby20] ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
+REQUIRED_USE=|| ( ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=https://github.com/guard/listen/archive/v0.7.3.tar.gz -> listen-0.7.3-git.tgz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	23ae8c186171e6476af098d2a50d0ee0	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=f1c8dd642ae1636bca027e9e373dffac
+_md5_=7d17655ed081f74525b57770689fcb59
diff --git a/metadata/md5-cache/dev-ruby/listen-1.3.1-r2 b/metadata/md5-cache/dev-ruby/listen-1.3.1-r2
index b86f6f1c1f41..7a2886811aad 100644
--- a/metadata/md5-cache/dev-ruby/listen-1.3.1-r2
+++ b/metadata/md5-cache/dev-ruby/listen-1.3.1-r2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby19? ( >=dev-ruby/rb-inotify-0.9.0[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/rb-inotify-0.9.0[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby20] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) )
+DEPEND=test? ( ruby_targets_ruby20? ( >=dev-ruby/rb-inotify-0.9.0[ruby_targets_ruby20] ) ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby20] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby20] ) ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) )
 DESCRIPTION=Listens to file modifications and notifies you about the changes
 EAPI=5
 HOMEPAGE=https://github.com/guard/listen
-IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby20 test test
 KEYWORDS=amd64 ~arm ~ppc ~ppc64 x86 ~x64-macos
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/rb-inotify-0.9.0[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/rb-inotify-0.9.0[ruby_targets_ruby20] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
+RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/rb-inotify-0.9.0[ruby_targets_ruby20] ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
+REQUIRED_USE=|| ( ruby_targets_ruby20 )
 SLOT=1
 SRC_URI=https://github.com/guard/listen/archive/v1.3.1.tar.gz -> listen-1.3.1-git.tgz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	23ae8c186171e6476af098d2a50d0ee0	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=e5a85581e5e5f253466385de74c1889e
+_md5_=be42453da3ac9a5bba1196e72742faa8
diff --git a/metadata/md5-cache/dev-ruby/logue-1.0.2-r1 b/metadata/md5-cache/dev-ruby/logue-1.0.2-r1
deleted file mode 100644
index f711de3deaba..000000000000
--- a/metadata/md5-cache/dev-ruby/logue-1.0.2-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby19? ( >=dev-ruby/rainbow-2.0.0[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/rainbow-2.0.0[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) )
-DESCRIPTION=A module that adds logging/trace functionality
-EAPI=5
-HOMEPAGE=https://github.com/jpace/logue
-IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 doc test test
-KEYWORDS=amd64 hppa ~ppc ~sparc x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/rainbow-2.0.0[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/rainbow-2.0.0[ruby_targets_ruby20] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
-SLOT=0
-SRC_URI=https://github.com/jpace/logue/archive/v1.0.2.tar.gz -> logue-git-1.0.2.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	23ae8c186171e6476af098d2a50d0ee0	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=459d058633d4f482daf8fa9ca951d0d1
diff --git a/metadata/md5-cache/dev-ruby/logue-1.0.2-r2 b/metadata/md5-cache/dev-ruby/logue-1.0.2-r2
index 2c8468271db4..76068a51af28 100644
--- a/metadata/md5-cache/dev-ruby/logue-1.0.2-r2
+++ b/metadata/md5-cache/dev-ruby/logue-1.0.2-r2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby19? ( >=dev-ruby/rainbow-2.0.0[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/rainbow-2.0.0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/rainbow-2.0.0[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) )
+DEPEND=test? ( ruby_targets_ruby20? ( >=dev-ruby/rainbow-2.0.0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/rainbow-2.0.0[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] ) )
 DESCRIPTION=A module that adds logging/trace functionality
 EAPI=5
 HOMEPAGE=https://github.com/jpace/logue
-IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 doc test test
-KEYWORDS=~amd64 ~hppa ~ppc ~sparc ~x86
+IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 doc test test
+KEYWORDS=amd64 hppa ~ppc ~sparc x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/rainbow-2.0.0[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/rainbow-2.0.0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/rainbow-2.0.0[ruby_targets_ruby21] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
+RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/rainbow-2.0.0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/rainbow-2.0.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 )
 SLOT=0
 SRC_URI=https://github.com/jpace/logue/archive/v1.0.2.tar.gz -> logue-git-1.0.2.tgz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	23ae8c186171e6476af098d2a50d0ee0	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=b6bf0e2df17e90716a596a0543a43c9d
+_md5_=ecd69c7b4e728fa7673221a756a8ba26
diff --git a/metadata/md5-cache/dev-ruby/mime-types-1.25.1 b/metadata/md5-cache/dev-ruby/mime-types-1.25.1
index ec1537d2034c..01bb6f0a9d0c 100644
--- a/metadata/md5-cache/dev-ruby/mime-types-1.25.1
+++ b/metadata/md5-cache/dev-ruby/mime-types-1.25.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby19? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) 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_ruby19? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) 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_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
+DEPEND=ruby_targets_ruby20? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest:5[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? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[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=Provides a mailcap-like MIME Content-Type lookup for Ruby
 EAPI=5
 HOMEPAGE=https://github.com/halostatue/mime-types/
-IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc test test
 KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT Artistic GPL-2
-RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) 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_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) 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_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
+RDEPEND=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/mime-types-1.25.1.gem
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	23ae8c186171e6476af098d2a50d0ee0	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=d74d083aa5c08b04865cec261021721b
+_md5_=72a6044b5609ac26af1fbad3b3ba07ba
diff --git a/metadata/md5-cache/dev-ruby/mime-types-2.6.2 b/metadata/md5-cache/dev-ruby/mime-types-2.6.2
index b7736fc43cb4..0be16920220d 100644
--- a/metadata/md5-cache/dev-ruby/mime-types-2.6.2
+++ b/metadata/md5-cache/dev-ruby/mime-types-2.6.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby19? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) 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_ruby19? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) 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_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
+DEPEND=ruby_targets_ruby20? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest:5[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? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[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=Provides a mailcap-like MIME Content-Type lookup for Ruby
 EAPI=5
 HOMEPAGE=https://github.com/mime-types/ruby-mime-types
-IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc test test
 KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT Artistic GPL-2
-RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) 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_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) 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_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
+RDEPEND=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=2
 SRC_URI=mirror://rubygems/mime-types-2.6.2.gem
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	23ae8c186171e6476af098d2a50d0ee0	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=96e4c8a0363405671c3e7a37c730cb41
+_md5_=500c0fe9c77bce6a2fc5426873c3f819
diff --git a/metadata/md5-cache/dev-ruby/pg_array_parser-0.0.9-r1 b/metadata/md5-cache/dev-ruby/pg_array_parser-0.0.9-r1
index 20a206c97d9b..8fead43c4d9e 100644
--- a/metadata/md5-cache/dev-ruby/pg_array_parser-0.0.9-r1
+++ b/metadata/md5-cache/dev-ruby/pg_array_parser-0.0.9-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby19? ( dev-ruby/bundler[ruby_targets_ruby19] ) ruby_targets_ruby20? ( dev-ruby/bundler[ruby_targets_ruby20] ) ruby_targets_ruby21? ( dev-ruby/bundler[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/bundler[ruby_targets_ruby22] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) 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_ruby19? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby19] ) ) 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_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) 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_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
+DEPEND=ruby_targets_ruby20? ( dev-ruby/bundler[ruby_targets_ruby20] ) ruby_targets_ruby21? ( dev-ruby/bundler[ruby_targets_ruby21] ) 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? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) 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=Simple library to parse PostgreSQL arrays into a array of strings
 EAPI=5
 HOMEPAGE=https://github.com/dockyard/pg_array_parser
-IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc test test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) 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_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) 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_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
+RDEPEND=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.0.9
 SRC_URI=mirror://rubygems/pg_array_parser-0.0.9.gem
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	23ae8c186171e6476af098d2a50d0ee0	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=1525a1562f94d1d115e2d87adbb925f6
+_md5_=e26ad2f0114cb85a9c1fcbd4f363370c
diff --git a/metadata/md5-cache/dev-ruby/pluggaloid-1.1.1 b/metadata/md5-cache/dev-ruby/pluggaloid-1.1.1
new file mode 100644
index 000000000000..4c8d3e1cc98b
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/pluggaloid-1.1.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby21? ( dev-ruby/delayer[ruby_targets_ruby21] dev-ruby/instance_storage:0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/delayer[ruby_targets_ruby22] dev-ruby/instance_storage:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/delayer[ruby_targets_ruby23] dev-ruby/instance_storage:0[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=Pluggaloid is extensible plugin system for mikutter
+EAPI=5
+HOMEPAGE=https://rubygems.org/gems/pluggaloid/
+IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby21? ( dev-ruby/delayer[ruby_targets_ruby21] dev-ruby/instance_storage:0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/delayer[ruby_targets_ruby22] dev-ruby/instance_storage:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/delayer[ruby_targets_ruby23] dev-ruby/instance_storage:0[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/pluggaloid-1.1.1.gem
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	23ae8c186171e6476af098d2a50d0ee0	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=923bcdeaca46298cddffa4954170faf8
diff --git a/metadata/md5-cache/dev-ruby/prawn-1.3.0 b/metadata/md5-cache/dev-ruby/prawn-1.3.0
index 67f632925676..24a275501762 100644
--- a/metadata/md5-cache/dev-ruby/prawn-1.3.0
+++ b/metadata/md5-cache/dev-ruby/prawn-1.3.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby19? ( >=dev-ruby/pdf-core-0.4.0[ruby_targets_ruby19] >=dev-ruby/ttfunk-1.4.0[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/pdf-core-0.4.0[ruby_targets_ruby20] >=dev-ruby/ttfunk-1.4.0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/pdf-core-0.4.0[ruby_targets_ruby21] >=dev-ruby/ttfunk-1.4.0[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/coderay[ruby_targets_ruby19] dev-ruby/mocha[ruby_targets_ruby19] >=dev-ruby/pdf-inspector-1.1.0[ruby_targets_ruby19] >=dev-ruby/pdf-reader-1.2[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/coderay[ruby_targets_ruby20] dev-ruby/mocha[ruby_targets_ruby20] >=dev-ruby/pdf-inspector-1.1.0[ruby_targets_ruby20] >=dev-ruby/pdf-reader-1.2[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/coderay[ruby_targets_ruby21] dev-ruby/mocha[ruby_targets_ruby21] >=dev-ruby/pdf-inspector-1.1.0[ruby_targets_ruby21] >=dev-ruby/pdf-reader-1.2[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( doc? ( dev-ruby/yard[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/yard[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/yard[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby19] ) ) 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_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) )
+DEPEND=test? ( ruby_targets_ruby20? ( >=dev-ruby/pdf-core-0.4.0[ruby_targets_ruby20] >=dev-ruby/ttfunk-1.4.0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/pdf-core-0.4.0[ruby_targets_ruby21] >=dev-ruby/ttfunk-1.4.0[ruby_targets_ruby21] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/coderay[ruby_targets_ruby20] dev-ruby/mocha[ruby_targets_ruby20] >=dev-ruby/pdf-inspector-1.1.0[ruby_targets_ruby20] >=dev-ruby/pdf-reader-1.2[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/coderay[ruby_targets_ruby21] dev-ruby/mocha[ruby_targets_ruby21] >=dev-ruby/pdf-inspector-1.1.0[ruby_targets_ruby21] >=dev-ruby/pdf-reader-1.2[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/yard[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/yard[ruby_targets_ruby21] ) ) 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=Fast, Nimble PDF Generation For Ruby
 EAPI=5
 HOMEPAGE=http://prawn.majesticseacreature.com/
-IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 doc test test
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=|| ( GPL-2 Ruby )
-RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/pdf-core-0.4.0[ruby_targets_ruby19] >=dev-ruby/ttfunk-1.4.0[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/pdf-core-0.4.0[ruby_targets_ruby20] >=dev-ruby/ttfunk-1.4.0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/pdf-core-0.4.0[ruby_targets_ruby21] >=dev-ruby/ttfunk-1.4.0[ruby_targets_ruby21] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
+RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/pdf-core-0.4.0[ruby_targets_ruby20] >=dev-ruby/ttfunk-1.4.0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/pdf-core-0.4.0[ruby_targets_ruby21] >=dev-ruby/ttfunk-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 )
 SLOT=1
 SRC_URI=https://github.com/prawnpdf/prawn/archive/1.3.0.tar.gz -> prawn-1.3.0.tar.gz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	23ae8c186171e6476af098d2a50d0ee0	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=245ed20069276630de1eef5d45ac007b
+_md5_=584b4ceec48e41587e6439ca75649b3c
diff --git a/metadata/md5-cache/dev-ruby/prawn-2.0.2 b/metadata/md5-cache/dev-ruby/prawn-2.0.2
index 01103ce601d8..4b1797ff8359 100644
--- a/metadata/md5-cache/dev-ruby/prawn-2.0.2
+++ b/metadata/md5-cache/dev-ruby/prawn-2.0.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby19? ( >=dev-ruby/pdf-core-0.6.0[ruby_targets_ruby19] >=dev-ruby/ttfunk-1.4.0[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/pdf-core-0.6.0[ruby_targets_ruby20] >=dev-ruby/ttfunk-1.4.0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/pdf-core-0.6.0[ruby_targets_ruby21] >=dev-ruby/ttfunk-1.4.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/pdf-core-0.6.0[ruby_targets_ruby22] >=dev-ruby/ttfunk-1.4.0[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/coderay[ruby_targets_ruby19] dev-ruby/mocha[ruby_targets_ruby19] >=dev-ruby/pdf-inspector-1.2.0[ruby_targets_ruby19] >=dev-ruby/pdf-reader-1.2[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/coderay[ruby_targets_ruby20] dev-ruby/mocha[ruby_targets_ruby20] >=dev-ruby/pdf-inspector-1.2.0[ruby_targets_ruby20] >=dev-ruby/pdf-reader-1.2[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/coderay[ruby_targets_ruby21] dev-ruby/mocha[ruby_targets_ruby21] >=dev-ruby/pdf-inspector-1.2.0[ruby_targets_ruby21] >=dev-ruby/pdf-reader-1.2[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/coderay[ruby_targets_ruby22] dev-ruby/mocha[ruby_targets_ruby22] >=dev-ruby/pdf-inspector-1.2.0[ruby_targets_ruby22] >=dev-ruby/pdf-reader-1.2[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) 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_ruby19? ( doc? ( dev-ruby/yard[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/yard[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/yard[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby19] ) ) 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_ruby22? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby22] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) 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_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
+DEPEND=test? ( ruby_targets_ruby20? ( >=dev-ruby/pdf-core-0.6.0[ruby_targets_ruby20] >=dev-ruby/ttfunk-1.4.0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/pdf-core-0.6.0[ruby_targets_ruby21] >=dev-ruby/ttfunk-1.4.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/pdf-core-0.6.0[ruby_targets_ruby22] >=dev-ruby/ttfunk-1.4.0[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/coderay[ruby_targets_ruby20] dev-ruby/mocha[ruby_targets_ruby20] >=dev-ruby/pdf-inspector-1.2.0[ruby_targets_ruby20] >=dev-ruby/pdf-reader-1.2[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/coderay[ruby_targets_ruby21] dev-ruby/mocha[ruby_targets_ruby21] >=dev-ruby/pdf-inspector-1.2.0[ruby_targets_ruby21] >=dev-ruby/pdf-reader-1.2[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/coderay[ruby_targets_ruby22] dev-ruby/mocha[ruby_targets_ruby22] >=dev-ruby/pdf-inspector-1.2.0[ruby_targets_ruby22] >=dev-ruby/pdf-reader-1.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? ( doc? ( dev-ruby/yard[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/yard[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) 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_ruby22? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby22] >=dev-ruby/rspec-core-2.14.8-r2[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=Fast, Nimble PDF Generation For Ruby
 EAPI=5
 HOMEPAGE=http://prawn.majesticseacreature.com/
-IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc test test
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=|| ( GPL-2 Ruby )
-RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/pdf-core-0.6.0[ruby_targets_ruby19] >=dev-ruby/ttfunk-1.4.0[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/pdf-core-0.6.0[ruby_targets_ruby20] >=dev-ruby/ttfunk-1.4.0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/pdf-core-0.6.0[ruby_targets_ruby21] >=dev-ruby/ttfunk-1.4.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/pdf-core-0.6.0[ruby_targets_ruby22] >=dev-ruby/ttfunk-1.4.0[ruby_targets_ruby22] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) 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_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) 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_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
+RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/pdf-core-0.6.0[ruby_targets_ruby20] >=dev-ruby/ttfunk-1.4.0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/pdf-core-0.6.0[ruby_targets_ruby21] >=dev-ruby/ttfunk-1.4.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/pdf-core-0.6.0[ruby_targets_ruby22] >=dev-ruby/ttfunk-1.4.0[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=2
 SRC_URI=https://github.com/prawnpdf/prawn/archive/2.0.2.tar.gz -> prawn-2.0.2.tar.gz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	23ae8c186171e6476af098d2a50d0ee0	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=c4349083259c3b31e0cdef97f3ee664b
+_md5_=c05b86cd637458d874041bdea69f1c42
diff --git a/metadata/md5-cache/dev-ruby/racc-1.4.11 b/metadata/md5-cache/dev-ruby/racc-1.4.11
index cd833d494746..18f4a86e80fb 100644
--- a/metadata/md5-cache/dev-ruby/racc-1.4.11
+++ b/metadata/md5-cache/dev-ruby/racc-1.4.11
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby19? ( dev-ruby/rake[ruby_targets_ruby19] test? ( >=dev-ruby/minitest-4.0:0[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( dev-ruby/rake[ruby_targets_ruby20] test? ( >=dev-ruby/minitest-4.0:0[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( dev-ruby/rake[ruby_targets_ruby21] test? ( >=dev-ruby/minitest-4.0:0[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) )
+DEPEND=ruby_targets_ruby20? ( dev-ruby/rake[ruby_targets_ruby20] test? ( >=dev-ruby/minitest-4.0:0[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( dev-ruby/rake[ruby_targets_ruby21] test? ( >=dev-ruby/minitest-4.0:0[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] ) )
 DESCRIPTION=A LALR(1) parser generator for Ruby
 EAPI=5
 HOMEPAGE=https://github.com/tenderlove/racc
-IUSE=doc test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 doc test test
+IUSE=doc test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 doc test test
 KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2.1
-RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
+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/racc-1.4.11.gem
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	23ae8c186171e6476af098d2a50d0ee0	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=3dedf84da183afd41afe3ad8d96074a1
+_md5_=a3f2adc91fbd941dd593325701443ddd
diff --git a/metadata/md5-cache/dev-ruby/racc-1.4.12 b/metadata/md5-cache/dev-ruby/racc-1.4.12
index 3f8e30b74898..028df7d8a37a 100644
--- a/metadata/md5-cache/dev-ruby/racc-1.4.12
+++ b/metadata/md5-cache/dev-ruby/racc-1.4.12
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby19? ( dev-ruby/rake[ruby_targets_ruby19] test? ( >=dev-ruby/minitest-4.0:0[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( dev-ruby/rake[ruby_targets_ruby20] test? ( >=dev-ruby/minitest-4.0:0[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( dev-ruby/rake[ruby_targets_ruby21] test? ( >=dev-ruby/minitest-4.0:0[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( dev-ruby/rake[ruby_targets_ruby22] test? ( >=dev-ruby/minitest-4.0:0[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) 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_ruby19? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) 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_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
+DEPEND=ruby_targets_ruby20? ( dev-ruby/rake[ruby_targets_ruby20] test? ( >=dev-ruby/minitest-4.0:0[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( dev-ruby/rake[ruby_targets_ruby21] test? ( >=dev-ruby/minitest-4.0:0[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( dev-ruby/rake[ruby_targets_ruby22] test? ( >=dev-ruby/minitest-4.0:0[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? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[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=A LALR(1) parser generator for Ruby
 EAPI=5
 HOMEPAGE=https://github.com/tenderlove/racc
-IUSE=doc test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+IUSE=doc test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc test test
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2.1
-RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) 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_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) 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_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
+RDEPEND=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/racc-1.4.12.gem
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	23ae8c186171e6476af098d2a50d0ee0	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=3032c78deeffbc9477f4e047f9526fd0
+_md5_=ae06d175e601e1c7ea817c67172df201
diff --git a/metadata/md5-cache/dev-ruby/racc-1.4.13 b/metadata/md5-cache/dev-ruby/racc-1.4.13
index da273521b3bb..0c6c05973939 100644
--- a/metadata/md5-cache/dev-ruby/racc-1.4.13
+++ b/metadata/md5-cache/dev-ruby/racc-1.4.13
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby19? ( dev-ruby/rake[ruby_targets_ruby19] test? ( >=dev-ruby/minitest-4.0:0[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( dev-ruby/rake[ruby_targets_ruby20] test? ( >=dev-ruby/minitest-4.0:0[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( dev-ruby/rake[ruby_targets_ruby21] test? ( >=dev-ruby/minitest-4.0:0[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( dev-ruby/rake[ruby_targets_ruby22] test? ( >=dev-ruby/minitest-4.0:0[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) 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_ruby19? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) 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_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
+DEPEND=ruby_targets_ruby20? ( dev-ruby/rake[ruby_targets_ruby20] test? ( >=dev-ruby/minitest-4.0:0[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( dev-ruby/rake[ruby_targets_ruby21] test? ( >=dev-ruby/minitest-4.0:0[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( dev-ruby/rake[ruby_targets_ruby22] test? ( >=dev-ruby/minitest-4.0:0[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? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[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=A LALR(1) parser generator for Ruby
 EAPI=5
 HOMEPAGE=https://github.com/tenderlove/racc
-IUSE=doc test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+IUSE=doc test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc test test
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2.1
-RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) 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_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) 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_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
+RDEPEND=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/racc-1.4.13.gem
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	23ae8c186171e6476af098d2a50d0ee0	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=d1afb8f4cc408994cd37127eed0e1fc4
+_md5_=f2ad26622efab45dcfb44e4440daaed6
diff --git a/metadata/md5-cache/dev-ruby/rack-attack-4.3.1 b/metadata/md5-cache/dev-ruby/rack-attack-4.3.1
deleted file mode 100644
index 139c60934f6e..000000000000
--- a/metadata/md5-cache/dev-ruby/rack-attack-4.3.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby20? ( dev-ruby/rack:*[ruby_targets_ruby20] ) ruby_targets_ruby21? ( dev-ruby/rack:*[ruby_targets_ruby21] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/activesupport[ruby_targets_ruby20] dev-ruby/rack-test[ruby_targets_ruby20] dev-ruby/minitest[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/activesupport[ruby_targets_ruby21] dev-ruby/rack-test[ruby_targets_ruby21] dev-ruby/minitest[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] ) )
-DESCRIPTION=A DSL for blocking & throttling abusive clients
-EAPI=5
-HOMEPAGE=https://github.com/kickstarter/rack-attack
-IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 test test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby20? ( dev-ruby/rack:*[ruby_targets_ruby20] ) ruby_targets_ruby21? ( dev-ruby/rack:*[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/rack-attack-4.3.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	23ae8c186171e6476af098d2a50d0ee0	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=5fcf453d5cf948fb801e1f9341cfa6aa
diff --git a/metadata/md5-cache/dev-ruby/rack-attack-4.4.0 b/metadata/md5-cache/dev-ruby/rack-attack-4.4.0
deleted file mode 100644
index d66cafbfb37e..000000000000
--- a/metadata/md5-cache/dev-ruby/rack-attack-4.4.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby20? ( dev-ruby/rack:*[ruby_targets_ruby20] ) ruby_targets_ruby21? ( dev-ruby/rack:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/rack:*[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/activesupport[ruby_targets_ruby20] dev-ruby/rack-test[ruby_targets_ruby20] dev-ruby/minitest[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/activesupport[ruby_targets_ruby21] dev-ruby/rack-test[ruby_targets_ruby21] dev-ruby/minitest[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/activesupport[ruby_targets_ruby22] dev-ruby/rack-test[ruby_targets_ruby22] dev-ruby/minitest[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/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[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=A DSL for blocking & throttling abusive clients
-EAPI=5
-HOMEPAGE=https://github.com/kickstarter/rack-attack
-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/rack:*[ruby_targets_ruby20] ) ruby_targets_ruby21? ( dev-ruby/rack:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/rack:*[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/rack-attack-4.4.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	23ae8c186171e6476af098d2a50d0ee0	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=1a0575036981a9447dd95a39ef286cda
diff --git a/metadata/md5-cache/dev-ruby/rack-openid-1.3.1 b/metadata/md5-cache/dev-ruby/rack-openid-1.3.1
index e71f979f1997..c038eac14721 100644
--- a/metadata/md5-cache/dev-ruby/rack-openid-1.3.1
+++ b/metadata/md5-cache/dev-ruby/rack-openid-1.3.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby19? ( >=dev-ruby/ruby-openid-2.1.8[ruby_targets_ruby19] >=dev-ruby/rack-1.1.0[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/ruby-openid-2.1.8[ruby_targets_ruby20] >=dev-ruby/rack-1.1.0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/ruby-openid-2.1.8[ruby_targets_ruby21] >=dev-ruby/rack-1.1.0[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) )
+DEPEND=test? ( ruby_targets_ruby20? ( >=dev-ruby/ruby-openid-2.1.8[ruby_targets_ruby20] >=dev-ruby/rack-1.1.0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/ruby-openid-2.1.8[ruby_targets_ruby21] >=dev-ruby/rack-1.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] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) )
 DESCRIPTION=Provides a more HTTPish API around the ruby-openid library
 EAPI=5
 HOMEPAGE=https://github.com/josh/rack-openid
-IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 test
+IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/ruby-openid-2.1.8[ruby_targets_ruby19] >=dev-ruby/rack-1.1.0[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/ruby-openid-2.1.8[ruby_targets_ruby20] >=dev-ruby/rack-1.1.0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/ruby-openid-2.1.8[ruby_targets_ruby21] >=dev-ruby/rack-1.1.0[ruby_targets_ruby21] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
+RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/ruby-openid-2.1.8[ruby_targets_ruby20] >=dev-ruby/rack-1.1.0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/ruby-openid-2.1.8[ruby_targets_ruby21] >=dev-ruby/rack-1.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 )
 SLOT=0
 SRC_URI=mirror://rubygems/rack-openid-1.3.1.gem
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	23ae8c186171e6476af098d2a50d0ee0	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=d695ed59a54b2678564e895ca2faf942
+_md5_=3267c5609037db731ae1a9613a2ba5b3
diff --git a/metadata/md5-cache/dev-ruby/rack-openid-1.4.2 b/metadata/md5-cache/dev-ruby/rack-openid-1.4.2
index 3e29b682245a..09066e256465 100644
--- a/metadata/md5-cache/dev-ruby/rack-openid-1.4.2
+++ b/metadata/md5-cache/dev-ruby/rack-openid-1.4.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby19? ( >=dev-ruby/ruby-openid-2.1.8[ruby_targets_ruby19] >=dev-ruby/rack-1.1.0:*[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/ruby-openid-2.1.8[ruby_targets_ruby20] >=dev-ruby/rack-1.1.0:*[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/ruby-openid-2.1.8[ruby_targets_ruby21] >=dev-ruby/rack-1.1.0:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ruby-openid-2.1.8[ruby_targets_ruby22] >=dev-ruby/rack-1.1.0:*[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) 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_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) 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_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
+DEPEND=test? ( ruby_targets_ruby20? ( >=dev-ruby/ruby-openid-2.1.8[ruby_targets_ruby20] >=dev-ruby/rack-1.1.0:*[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/ruby-openid-2.1.8[ruby_targets_ruby21] >=dev-ruby/rack-1.1.0:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ruby-openid-2.1.8[ruby_targets_ruby22] >=dev-ruby/rack-1.1.0:*[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/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[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=Provides a more HTTPish API around the ruby-openid library
 EAPI=5
 HOMEPAGE=https://github.com/grosser/rack-openid
-IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 test test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/ruby-openid-2.1.8[ruby_targets_ruby19] >=dev-ruby/rack-1.1.0:*[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/ruby-openid-2.1.8[ruby_targets_ruby20] >=dev-ruby/rack-1.1.0:*[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/ruby-openid-2.1.8[ruby_targets_ruby21] >=dev-ruby/rack-1.1.0:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ruby-openid-2.1.8[ruby_targets_ruby22] >=dev-ruby/rack-1.1.0:*[ruby_targets_ruby22] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) 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_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) 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_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
+RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/ruby-openid-2.1.8[ruby_targets_ruby20] >=dev-ruby/rack-1.1.0:*[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/ruby-openid-2.1.8[ruby_targets_ruby21] >=dev-ruby/rack-1.1.0:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ruby-openid-2.1.8[ruby_targets_ruby22] >=dev-ruby/rack-1.1.0:*[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=https://github.com/grosser/rack-openid/archive/v1.4.2.tar.gz -> rack-openid-1.4.2.tar.gz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	23ae8c186171e6476af098d2a50d0ee0	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=200796c4459f6888d92a22879585bf2b
+_md5_=cf02355ed02e09343d1b8995225ab140
diff --git a/metadata/md5-cache/dev-ruby/ragol-1.0.1-r1 b/metadata/md5-cache/dev-ruby/ragol-1.0.1-r1
deleted file mode 100644
index 66119d843c11..000000000000
--- a/metadata/md5-cache/dev-ruby/ragol-1.0.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby19? ( >=dev-ruby/logue-1.0.0[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/logue-1.0.0[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby20] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) )
-DESCRIPTION=Another implementation of an option processor
-EAPI=5
-HOMEPAGE=https://github.com/jpace/ragol
-IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 doc test test
-KEYWORDS=amd64 hppa ~ppc ~sparc x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/logue-1.0.0[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/logue-1.0.0[ruby_targets_ruby20] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
-SLOT=0
-SRC_URI=https://github.com/jpace/ragol/archive/v1.0.1.tar.gz -> ragol-git-1.0.1.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	23ae8c186171e6476af098d2a50d0ee0	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=e3681a24c7b4296b514e668cbeb739cf
diff --git a/metadata/md5-cache/dev-ruby/ragol-1.0.1-r2 b/metadata/md5-cache/dev-ruby/ragol-1.0.1-r2
index 38c49e1f1aca..82bda73139a5 100644
--- a/metadata/md5-cache/dev-ruby/ragol-1.0.1-r2
+++ b/metadata/md5-cache/dev-ruby/ragol-1.0.1-r2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby19? ( >=dev-ruby/logue-1.0.0[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/logue-1.0.0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/logue-1.0.0[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby19] ) ) 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_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) )
+DEPEND=test? ( ruby_targets_ruby20? ( >=dev-ruby/logue-1.0.0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/logue-1.0.0[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/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=Another implementation of an option processor
 EAPI=5
 HOMEPAGE=https://github.com/jpace/ragol
-IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 doc test test
-KEYWORDS=~amd64 ~hppa ~ppc ~sparc ~x86
+IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 doc test test
+KEYWORDS=amd64 hppa ~ppc ~sparc x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/logue-1.0.0[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/logue-1.0.0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/logue-1.0.0[ruby_targets_ruby21] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
+RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/logue-1.0.0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/logue-1.0.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 )
 SLOT=0
 SRC_URI=https://github.com/jpace/ragol/archive/v1.0.1.tar.gz -> ragol-git-1.0.1.tgz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	23ae8c186171e6476af098d2a50d0ee0	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=7ced70dcad68b67023710d4e3bd0856a
+_md5_=2af2651ac2956c67a9b4112bf67c0e14
diff --git a/metadata/md5-cache/dev-ruby/rdiscount-1.6.8-r2 b/metadata/md5-cache/dev-ruby/rdiscount-1.6.8-r2
index 9a118cf35201..63d285b49210 100644
--- a/metadata/md5-cache/dev-ruby/rdiscount-1.6.8-r2
+++ b/metadata/md5-cache/dev-ruby/rdiscount-1.6.8-r2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby19? ( doc? ( app-text/ronn[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( app-text/ronn[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) )
+DEPEND=ruby_targets_ruby20? ( doc? ( app-text/ronn[ruby_targets_ruby20] ) ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby20? ( doc? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) )
 DESCRIPTION=Implementation of John Gruber's Markdown
 EAPI=5
 HOMEPAGE=https://github.com/rtomayko/rdiscount
-IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby20 doc test test
 KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
+RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
+REQUIRED_USE=|| ( ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/rdiscount-1.6.8.gem
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	23ae8c186171e6476af098d2a50d0ee0	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=e3c61c6c07a139b7154bff756af882dd
+_md5_=ca4574e2e3f2968942de61a7abd328f0
diff --git a/metadata/md5-cache/dev-ruby/rdiscount-1.6.8-r3 b/metadata/md5-cache/dev-ruby/rdiscount-1.6.8-r3
index a2d7b6e8b7cc..bbb15d5bccde 100644
--- a/metadata/md5-cache/dev-ruby/rdiscount-1.6.8-r3
+++ b/metadata/md5-cache/dev-ruby/rdiscount-1.6.8-r3
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby19? ( doc? ( app-text/ronn[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( app-text/ronn[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( app-text/ronn[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) )
+DEPEND=ruby_targets_ruby20? ( doc? ( app-text/ronn[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( app-text/ronn[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/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[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] ) )
 DESCRIPTION=Implementation of John Gruber's Markdown
 EAPI=5
 HOMEPAGE=https://github.com/rtomayko/rdiscount
-IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 doc test test
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
+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/rdiscount-1.6.8.gem
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	23ae8c186171e6476af098d2a50d0ee0	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=30c12c52820f1920c12802252a18e79b
+_md5_=48d2cb7367b4eba5343b8d47e4903e02
diff --git a/metadata/md5-cache/dev-ruby/recog-2.0.14-r1 b/metadata/md5-cache/dev-ruby/recog-2.0.14-r1
index fa6525b97dfb..0c58a2617fdd 100644
--- a/metadata/md5-cache/dev-ruby/recog-2.0.14-r1
+++ b/metadata/md5-cache/dev-ruby/recog-2.0.14-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby19? ( dev-ruby/nokogiri[ruby_targets_ruby19] !<dev-ruby/recog-2.0.6-r1[ruby_targets_ruby19] ) ruby_targets_ruby20? ( dev-ruby/nokogiri[ruby_targets_ruby20] !<dev-ruby/recog-2.0.6-r1[ruby_targets_ruby20] ) ruby_targets_ruby21? ( dev-ruby/nokogiri[ruby_targets_ruby21] !<dev-ruby/recog-2.0.6-r1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/nokogiri[ruby_targets_ruby22] !<dev-ruby/recog-2.0.6-r1[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/regexp_parser[ruby_targets_ruby19] dev-ruby/rspec:3[ruby_targets_ruby19] dev-util/aruba[ruby_targets_ruby19] dev-util/cucumber[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/regexp_parser[ruby_targets_ruby20] dev-ruby/rspec:3[ruby_targets_ruby20] dev-util/aruba[ruby_targets_ruby20] dev-util/cucumber[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/regexp_parser[ruby_targets_ruby21] dev-ruby/rspec:3[ruby_targets_ruby21] dev-util/aruba[ruby_targets_ruby21] dev-util/cucumber[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/regexp_parser[ruby_targets_ruby22] dev-ruby/rspec:3[ruby_targets_ruby22] dev-util/aruba[ruby_targets_ruby22] dev-util/cucumber[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) 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_ruby19? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) 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_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
+DEPEND=test? ( ruby_targets_ruby20? ( dev-ruby/nokogiri[ruby_targets_ruby20] !<dev-ruby/recog-2.0.6-r1[ruby_targets_ruby20] ) ruby_targets_ruby21? ( dev-ruby/nokogiri[ruby_targets_ruby21] !<dev-ruby/recog-2.0.6-r1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/nokogiri[ruby_targets_ruby22] !<dev-ruby/recog-2.0.6-r1[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/regexp_parser[ruby_targets_ruby20] dev-ruby/rspec:3[ruby_targets_ruby20] dev-util/aruba[ruby_targets_ruby20] dev-util/cucumber[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/regexp_parser[ruby_targets_ruby21] dev-ruby/rspec:3[ruby_targets_ruby21] dev-util/aruba[ruby_targets_ruby21] dev-util/cucumber[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/regexp_parser[ruby_targets_ruby22] dev-ruby/rspec:3[ruby_targets_ruby22] dev-util/aruba[ruby_targets_ruby22] dev-util/cucumber[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? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[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=Pattern recognition for hosts, services, and content
 EAPI=5
 HOMEPAGE=https://github.com/rapid7/recog
-IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc test test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=BSD-2
-RDEPEND=ruby_targets_ruby19? ( dev-ruby/nokogiri[ruby_targets_ruby19] !<dev-ruby/recog-2.0.6-r1[ruby_targets_ruby19] ) ruby_targets_ruby20? ( dev-ruby/nokogiri[ruby_targets_ruby20] !<dev-ruby/recog-2.0.6-r1[ruby_targets_ruby20] ) ruby_targets_ruby21? ( dev-ruby/nokogiri[ruby_targets_ruby21] !<dev-ruby/recog-2.0.6-r1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/nokogiri[ruby_targets_ruby22] !<dev-ruby/recog-2.0.6-r1[ruby_targets_ruby22] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) 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_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) 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_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
+RDEPEND=ruby_targets_ruby20? ( dev-ruby/nokogiri[ruby_targets_ruby20] !<dev-ruby/recog-2.0.6-r1[ruby_targets_ruby20] ) ruby_targets_ruby21? ( dev-ruby/nokogiri[ruby_targets_ruby21] !<dev-ruby/recog-2.0.6-r1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/nokogiri[ruby_targets_ruby22] !<dev-ruby/recog-2.0.6-r1[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=2.0.14
 SRC_URI=mirror://rubygems/recog-2.0.14.gem
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	23ae8c186171e6476af098d2a50d0ee0	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=ebfb24e16be89d155faa2e84e1330194
+_md5_=61b3ceb409caa1f61999b29386d797f2
diff --git a/metadata/md5-cache/dev-ruby/recog-2.0.6-r1 b/metadata/md5-cache/dev-ruby/recog-2.0.6-r1
index 31e6fc95cfcd..425d8ab12771 100644
--- a/metadata/md5-cache/dev-ruby/recog-2.0.6-r1
+++ b/metadata/md5-cache/dev-ruby/recog-2.0.6-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby19? ( dev-ruby/nokogiri[ruby_targets_ruby19] !=dev-ruby/recog-2.0.0[ruby_targets_ruby19] !<dev-ruby/recog-2.0.6-r1[ruby_targets_ruby19] ) ruby_targets_ruby20? ( dev-ruby/nokogiri[ruby_targets_ruby20] !=dev-ruby/recog-2.0.0[ruby_targets_ruby20] !<dev-ruby/recog-2.0.6-r1[ruby_targets_ruby20] ) ruby_targets_ruby21? ( dev-ruby/nokogiri[ruby_targets_ruby21] !=dev-ruby/recog-2.0.0[ruby_targets_ruby21] !<dev-ruby/recog-2.0.6-r1[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) )
+DEPEND=test? ( ruby_targets_ruby20? ( dev-ruby/nokogiri[ruby_targets_ruby20] !=dev-ruby/recog-2.0.0[ruby_targets_ruby20] !<dev-ruby/recog-2.0.6-r1[ruby_targets_ruby20] ) ruby_targets_ruby21? ( dev-ruby/nokogiri[ruby_targets_ruby21] !=dev-ruby/recog-2.0.0[ruby_targets_ruby21] !<dev-ruby/recog-2.0.6-r1[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/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[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] ) )
 DESCRIPTION=Pattern recognition for hosts, services, and content
 EAPI=5
 HOMEPAGE=https://github.com/rapid7/recog
-IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 doc test test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=BSD
-RDEPEND=ruby_targets_ruby19? ( dev-ruby/nokogiri[ruby_targets_ruby19] !=dev-ruby/recog-2.0.0[ruby_targets_ruby19] !<dev-ruby/recog-2.0.6-r1[ruby_targets_ruby19] ) ruby_targets_ruby20? ( dev-ruby/nokogiri[ruby_targets_ruby20] !=dev-ruby/recog-2.0.0[ruby_targets_ruby20] !<dev-ruby/recog-2.0.6-r1[ruby_targets_ruby20] ) ruby_targets_ruby21? ( dev-ruby/nokogiri[ruby_targets_ruby21] !=dev-ruby/recog-2.0.0[ruby_targets_ruby21] !<dev-ruby/recog-2.0.6-r1[ruby_targets_ruby21] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
+RDEPEND=ruby_targets_ruby20? ( dev-ruby/nokogiri[ruby_targets_ruby20] !=dev-ruby/recog-2.0.0[ruby_targets_ruby20] !<dev-ruby/recog-2.0.6-r1[ruby_targets_ruby20] ) ruby_targets_ruby21? ( dev-ruby/nokogiri[ruby_targets_ruby21] !=dev-ruby/recog-2.0.0[ruby_targets_ruby21] !<dev-ruby/recog-2.0.6-r1[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=2.0.6
 SRC_URI=mirror://rubygems/recog-2.0.6.gem
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	23ae8c186171e6476af098d2a50d0ee0	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=f8e0d815d7876434cf366a2157225998
+_md5_=289adf1c831fa274f9a9fc0e51928f8f
diff --git a/metadata/md5-cache/dev-ruby/rest-client-1.8.0 b/metadata/md5-cache/dev-ruby/rest-client-1.8.0
index e10e3610a509..f5fdacc0c2c9 100644
--- a/metadata/md5-cache/dev-ruby/rest-client-1.8.0
+++ b/metadata/md5-cache/dev-ruby/rest-client-1.8.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby19? ( test? ( dev-ruby/webmock[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/webmock[ruby_targets_ruby20] ) ) test? ( ruby_targets_ruby19? ( >=dev-ruby/http-cookie-1.0.2:0[ruby_targets_ruby19] >=dev-ruby/mime-types-1.16[ruby_targets_ruby19] >=dev-ruby/netrc-0.7:0[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/http-cookie-1.0.2:0[ruby_targets_ruby20] >=dev-ruby/mime-types-1.16[ruby_targets_ruby20] >=dev-ruby/netrc-0.7:0[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby20] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) )
+DEPEND=ruby_targets_ruby20? ( test? ( dev-ruby/webmock[ruby_targets_ruby20] ) ) test? ( ruby_targets_ruby20? ( >=dev-ruby/http-cookie-1.0.2:0[ruby_targets_ruby20] >=dev-ruby/mime-types-1.16[ruby_targets_ruby20] >=dev-ruby/netrc-0.7:0[ruby_targets_ruby20] ) ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby20? ( doc? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby20] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby20] ) ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) )
 DESCRIPTION=Simple Simple HTTP and REST client for Ruby
 EAPI=5
 HOMEPAGE=https://github.com/archiloque/rest-client
-IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby20 doc test test
 KEYWORDS=amd64 x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/http-cookie-1.0.2:0[ruby_targets_ruby19] >=dev-ruby/mime-types-1.16[ruby_targets_ruby19] >=dev-ruby/netrc-0.7:0[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/http-cookie-1.0.2:0[ruby_targets_ruby20] >=dev-ruby/mime-types-1.16[ruby_targets_ruby20] >=dev-ruby/netrc-0.7:0[ruby_targets_ruby20] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
+RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/http-cookie-1.0.2:0[ruby_targets_ruby20] >=dev-ruby/mime-types-1.16[ruby_targets_ruby20] >=dev-ruby/netrc-0.7:0[ruby_targets_ruby20] ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
+REQUIRED_USE=|| ( ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/rest-client-1.8.0.gem
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	23ae8c186171e6476af098d2a50d0ee0	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=4b4768fa5e9e110d540a7e2d9d650a04
+_md5_=a34f1c7ccbe8545422b64610dab036f1
diff --git a/metadata/md5-cache/dev-ruby/rest-client-1.8.0-r1 b/metadata/md5-cache/dev-ruby/rest-client-1.8.0-r1
index 562649964e8b..04129cdbb2ac 100644
--- a/metadata/md5-cache/dev-ruby/rest-client-1.8.0-r1
+++ b/metadata/md5-cache/dev-ruby/rest-client-1.8.0-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby19? ( test? ( dev-ruby/webmock[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/webmock[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/webmock[ruby_targets_ruby21] ) ) test? ( ruby_targets_ruby19? ( >=dev-ruby/http-cookie-1.0.2:0[ruby_targets_ruby19] >=dev-ruby/mime-types-1.16[ruby_targets_ruby19] >=dev-ruby/netrc-0.7:0[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/http-cookie-1.0.2:0[ruby_targets_ruby20] >=dev-ruby/mime-types-1.16[ruby_targets_ruby20] >=dev-ruby/netrc-0.7:0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/http-cookie-1.0.2:0[ruby_targets_ruby21] >=dev-ruby/mime-types-1.16[ruby_targets_ruby21] >=dev-ruby/netrc-0.7:0[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby19] ) ) 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_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) )
+DEPEND=ruby_targets_ruby20? ( test? ( dev-ruby/webmock[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/webmock[ruby_targets_ruby21] ) ) test? ( ruby_targets_ruby20? ( >=dev-ruby/http-cookie-1.0.2:0[ruby_targets_ruby20] >=dev-ruby/mime-types-1.16[ruby_targets_ruby20] >=dev-ruby/netrc-0.7:0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/http-cookie-1.0.2:0[ruby_targets_ruby21] >=dev-ruby/mime-types-1.16[ruby_targets_ruby21] >=dev-ruby/netrc-0.7:0[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/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) 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=Simple Simple HTTP and REST client for Ruby
 EAPI=5
 HOMEPAGE=https://github.com/archiloque/rest-client
-IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 doc test test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/http-cookie-1.0.2:0[ruby_targets_ruby19] >=dev-ruby/mime-types-1.16[ruby_targets_ruby19] >=dev-ruby/netrc-0.7:0[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/http-cookie-1.0.2:0[ruby_targets_ruby20] >=dev-ruby/mime-types-1.16[ruby_targets_ruby20] >=dev-ruby/netrc-0.7:0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/http-cookie-1.0.2:0[ruby_targets_ruby21] >=dev-ruby/mime-types-1.16[ruby_targets_ruby21] >=dev-ruby/netrc-0.7:0[ruby_targets_ruby21] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
+RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/http-cookie-1.0.2:0[ruby_targets_ruby20] >=dev-ruby/mime-types-1.16[ruby_targets_ruby20] >=dev-ruby/netrc-0.7:0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/http-cookie-1.0.2:0[ruby_targets_ruby21] >=dev-ruby/mime-types-1.16[ruby_targets_ruby21] >=dev-ruby/netrc-0.7: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 )
 SLOT=0
 SRC_URI=mirror://rubygems/rest-client-1.8.0.gem
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	23ae8c186171e6476af098d2a50d0ee0	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=e032fd2f07eaab81f60af1dd9edec7ba
+_md5_=0a981e3a2ab60a9052009aec561f94fb
diff --git a/metadata/md5-cache/dev-ruby/riel-1.2.0-r1 b/metadata/md5-cache/dev-ruby/riel-1.2.0-r1
deleted file mode 100644
index a424d006a726..000000000000
--- a/metadata/md5-cache/dev-ruby/riel-1.2.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby19? ( >=dev-ruby/rainbow-1.1.4[ruby_targets_ruby19] dev-ruby/logue[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/rainbow-1.1.4[ruby_targets_ruby20] dev-ruby/logue[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) )
-DESCRIPTION=This library extends the core Ruby libraries
-EAPI=5
-HOMEPAGE=https://github.com/jpace/riel
-IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 doc test test
-KEYWORDS=amd64 hppa ~ppc ~sparc x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/rainbow-1.1.4[ruby_targets_ruby19] dev-ruby/logue[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/rainbow-1.1.4[ruby_targets_ruby20] dev-ruby/logue[ruby_targets_ruby20] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
-SLOT=0
-SRC_URI=https://github.com/jpace/riel/archive/v1.2.0.tar.gz -> riel-git-1.2.0.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	23ae8c186171e6476af098d2a50d0ee0	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=3650ba59a04f68bb3e8f06f3679bd679
diff --git a/metadata/md5-cache/dev-ruby/riel-1.2.0-r2 b/metadata/md5-cache/dev-ruby/riel-1.2.0-r2
index 7e386b2744fa..0e68b4ac1436 100644
--- a/metadata/md5-cache/dev-ruby/riel-1.2.0-r2
+++ b/metadata/md5-cache/dev-ruby/riel-1.2.0-r2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby19? ( >=dev-ruby/rainbow-1.1.4[ruby_targets_ruby19] dev-ruby/logue[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/rainbow-1.1.4[ruby_targets_ruby20] dev-ruby/logue[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/rainbow-1.1.4[ruby_targets_ruby21] dev-ruby/logue[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) )
+DEPEND=test? ( ruby_targets_ruby20? ( >=dev-ruby/rainbow-1.1.4:*[ruby_targets_ruby20] dev-ruby/logue[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/rainbow-1.1.4:*[ruby_targets_ruby21] dev-ruby/logue[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] ) )
 DESCRIPTION=This library extends the core Ruby libraries
 EAPI=5
 HOMEPAGE=https://github.com/jpace/riel
-IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 doc test test
-KEYWORDS=~amd64 ~hppa ~ppc ~sparc ~x86
+IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 doc test test
+KEYWORDS=amd64 hppa ~ppc ~sparc x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/rainbow-1.1.4[ruby_targets_ruby19] dev-ruby/logue[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/rainbow-1.1.4[ruby_targets_ruby20] dev-ruby/logue[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/rainbow-1.1.4[ruby_targets_ruby21] dev-ruby/logue[ruby_targets_ruby21] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
+RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/rainbow-1.1.4:*[ruby_targets_ruby20] dev-ruby/logue[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/rainbow-1.1.4:*[ruby_targets_ruby21] dev-ruby/logue[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=https://github.com/jpace/riel/archive/v1.2.0.tar.gz -> riel-git-1.2.0.tgz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	23ae8c186171e6476af098d2a50d0ee0	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=2e77e5d6ad02393d3a33408e8a0b0dd4
+_md5_=29516fed4c6be4c03c8274f0a5d10a4f
diff --git a/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.4.8 b/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.4.8
index 8c962be91c12..91ab0802ce3c 100644
--- a/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.4.8
+++ b/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.4.8
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=net-analyzer/rrdtool[graph] ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 )
+DEPEND=net-analyzer/rrdtool[graph] ruby_targets_ruby20? ( dev-lang/ruby:2.0 )
 DESCRIPTION=Ruby bindings for rrdtool
 EAPI=5
 HOMEPAGE=http://oss.oetiker.ch/rrdtool/
-IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20
+IUSE=elibc_FreeBSD ruby_targets_ruby20
 KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos ~x86-solaris
 LICENSE=GPL-2
-RDEPEND=net-analyzer/rrdtool[graph] !!<net-analyzer/rrdtool-1.4.8-r1 ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
+RDEPEND=net-analyzer/rrdtool[graph] !!<net-analyzer/rrdtool-1.4.8-r1 ruby_targets_ruby20? ( dev-lang/ruby:2.0 )
+REQUIRED_USE=|| ( ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=http://oss.oetiker.ch/rrdtool/pub/rrdtool-1.4.8.tar.gz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	23ae8c186171e6476af098d2a50d0ee0	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=2b4cfd87e5e3960dc169998789a2ab67
+_md5_=8fc1240e03f5baf44f260f1af8c42a26
diff --git a/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.4.8-r2 b/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.4.8-r2
index 5802868924b5..f6b6c9aa09b3 100644
--- a/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.4.8-r2
+++ b/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.4.8-r2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ~net-analyzer/rrdtool-1.4.8[graph] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 )
+DEPEND=test? ( ~net-analyzer/rrdtool-1.4.8[graph] ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 )
 DESCRIPTION=Ruby bindings for rrdtool
 EAPI=5
 HOMEPAGE=http://oss.oetiker.ch/rrdtool/
-IUSE=graph test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21
+IUSE=graph test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos ~x86-solaris
 LICENSE=GPL-2
-RDEPEND=~net-analyzer/rrdtool-1.4.8[graph=] ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 )
-REQUIRED_USE=test? ( graph ) || ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
+RDEPEND=~net-analyzer/rrdtool-1.4.8[graph=] ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 )
+REQUIRED_USE=test? ( graph ) || ( ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=http://oss.oetiker.ch/rrdtool/pub/rrdtool-1.4.8.tar.gz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	23ae8c186171e6476af098d2a50d0ee0	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=746fb5df0070168cf07c6bd24318c635
+_md5_=8ca20f1d08c88f82d4a88e59ae21c8eb
diff --git a/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.4.9 b/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.4.9
index 34a8dfaba729..443c16c8dc80 100644
--- a/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.4.9
+++ b/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.4.9
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ~net-analyzer/rrdtool-1.4.9[graph] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 )
+DEPEND=test? ( ~net-analyzer/rrdtool-1.4.9[graph] ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 )
 DESCRIPTION=Ruby bindings for rrdtool
 EAPI=5
 HOMEPAGE=http://oss.oetiker.ch/rrdtool/
-IUSE=graph test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21
+IUSE=graph test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos ~x86-solaris
 LICENSE=GPL-2
-RDEPEND=~net-analyzer/rrdtool-1.4.9[graph=] ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 )
-REQUIRED_USE=test? ( graph ) || ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
+RDEPEND=~net-analyzer/rrdtool-1.4.9[graph=] ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 )
+REQUIRED_USE=test? ( graph ) || ( ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=http://oss.oetiker.ch/rrdtool/pub/rrdtool-1.4.9.tar.gz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	23ae8c186171e6476af098d2a50d0ee0	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=a50775549e3327bfeff05a734ff08e59
+_md5_=4f49a3ac849ade6cc3d8a9910f6b3004
diff --git a/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.5.3 b/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.5.3
index 7bd7d6b423d8..515afcb78621 100644
--- a/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.5.3
+++ b/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.5.3
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ~net-analyzer/rrdtool-1.5.3[graph] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 )
+DEPEND=test? ( ~net-analyzer/rrdtool-1.5.3[graph] ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 )
 DESCRIPTION=Ruby bindings for rrdtool
 EAPI=5
 HOMEPAGE=http://oss.oetiker.ch/rrdtool/
-IUSE=graph test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22
+IUSE=graph test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos ~x86-solaris
 LICENSE=GPL-2
-RDEPEND=~net-analyzer/rrdtool-1.5.3[graph=] ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 )
-REQUIRED_USE=test? ( graph ) || ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
+RDEPEND=~net-analyzer/rrdtool-1.5.3[graph=] ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 )
+REQUIRED_USE=test? ( graph ) || ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=http://oss.oetiker.ch/rrdtool/pub/rrdtool-1.5.3.tar.gz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	23ae8c186171e6476af098d2a50d0ee0	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=59034da2ae80b38027dc9b3fae3c1b63
+_md5_=e01d13cd67bbd2df762d915326139a10
diff --git a/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.5.4 b/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.5.4
index 4d64b3446458..c59bc76f3739 100644
--- a/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.5.4
+++ b/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.5.4
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ~net-analyzer/rrdtool-1.5.4[graph] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 )
+DEPEND=test? ( ~net-analyzer/rrdtool-1.5.4[graph] ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 )
 DESCRIPTION=Ruby bindings for rrdtool
 EAPI=5
 HOMEPAGE=http://oss.oetiker.ch/rrdtool/
-IUSE=graph test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22
+IUSE=graph test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22
 KEYWORDS=~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos ~x86-solaris
 LICENSE=GPL-2
-RDEPEND=~net-analyzer/rrdtool-1.5.4[graph=] ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 )
-REQUIRED_USE=test? ( graph ) || ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
+RDEPEND=~net-analyzer/rrdtool-1.5.4[graph=] ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 )
+REQUIRED_USE=test? ( graph ) || ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=http://oss.oetiker.ch/rrdtool/pub/rrdtool-1.5.4.tar.gz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	23ae8c186171e6476af098d2a50d0ee0	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=b7c4adf44ab3957ff41eca28219c9e7a
+_md5_=689fb6c8990004f7eeba52a3153d4100
diff --git a/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.5.5 b/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.5.5
index 7adcf43872ba..e2b7f377b4aa 100644
--- a/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.5.5
+++ b/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.5.5
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ~net-analyzer/rrdtool-1.5.5[graph] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 )
+DEPEND=test? ( ~net-analyzer/rrdtool-1.5.5[graph] ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 )
 DESCRIPTION=Ruby bindings for rrdtool
 EAPI=5
 HOMEPAGE=http://oss.oetiker.ch/rrdtool/
-IUSE=graph test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22
+IUSE=graph test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22
 KEYWORDS=alpha amd64 ~arm hppa ~mips ~ppc ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos ~x86-solaris
 LICENSE=GPL-2
-RDEPEND=~net-analyzer/rrdtool-1.5.5[graph=] ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 )
-REQUIRED_USE=test? ( graph ) || ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
+RDEPEND=~net-analyzer/rrdtool-1.5.5[graph=] ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 )
+REQUIRED_USE=test? ( graph ) || ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=http://oss.oetiker.ch/rrdtool/pub/rrdtool-1.5.5.tar.gz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	23ae8c186171e6476af098d2a50d0ee0	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=c3577aacba862bf7d9c4bdf97670f5a4
+_md5_=a1b9d82a96d3c83eb4eced12e7b3c86e
diff --git a/metadata/md5-cache/dev-ruby/rspec-core-2.14.8-r2 b/metadata/md5-cache/dev-ruby/rspec-core-2.14.8-r2
index f6005a546e4c..9a535922b2ce 100644
--- a/metadata/md5-cache/dev-ruby/rspec-core-2.14.8-r2
+++ b/metadata/md5-cache/dev-ruby/rspec-core-2.14.8-r2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby19? ( test? ( >=dev-ruby/nokogiri-1.5.2[ruby_targets_ruby19] dev-ruby/syntax[ruby_targets_ruby19] >=dev-ruby/zentest-4.6.2[ruby_targets_ruby19] >=dev-ruby/rspec-expectations-2.14.0:2[ruby_targets_ruby19] >=dev-ruby/rspec-mocks-2.12.0:2[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( >=dev-ruby/nokogiri-1.5.2[ruby_targets_ruby20] dev-ruby/syntax[ruby_targets_ruby20] >=dev-ruby/zentest-4.6.2[ruby_targets_ruby20] >=dev-ruby/rspec-expectations-2.14.0:2[ruby_targets_ruby20] >=dev-ruby/rspec-mocks-2.12.0:2[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( doc? ( dev-ruby/yard[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) )
+DEPEND=ruby_targets_ruby20? ( test? ( >=dev-ruby/nokogiri-1.5.2[ruby_targets_ruby20] dev-ruby/syntax[ruby_targets_ruby20] >=dev-ruby/zentest-4.6.2[ruby_targets_ruby20] >=dev-ruby/rspec-expectations-2.14.0:2[ruby_targets_ruby20] >=dev-ruby/rspec-mocks-2.12.0:2[ruby_targets_ruby20] ) ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby20? ( doc? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) )
 DESCRIPTION=A Behaviour Driven Development (BDD) framework for Ruby
 EAPI=5
 HOMEPAGE=http://rspec.rubyforge.org/
-IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby20 doc test test
 KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
+RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
+REQUIRED_USE=|| ( ruby_targets_ruby20 )
 SLOT=2
 SRC_URI=https://github.com/rspec/rspec-core/archive/v2.14.8.tar.gz -> rspec-core-2.14.8-git.tgz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	23ae8c186171e6476af098d2a50d0ee0	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=d5ae01b4be5b448312bbc32f02818fb4
+_md5_=818e69255757957af1b86ea0240a5356
diff --git a/metadata/md5-cache/dev-ruby/rspec-core-2.14.8-r4 b/metadata/md5-cache/dev-ruby/rspec-core-2.14.8-r4
index 1af88cf99477..47b03df968b0 100644
--- a/metadata/md5-cache/dev-ruby/rspec-core-2.14.8-r4
+++ b/metadata/md5-cache/dev-ruby/rspec-core-2.14.8-r4
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby19? ( test? ( >=dev-ruby/nokogiri-1.5.2[ruby_targets_ruby19] dev-ruby/syntax[ruby_targets_ruby19] >=dev-ruby/zentest-4.6.2[ruby_targets_ruby19] >=dev-ruby/rspec-expectations-2.14.0:2[ruby_targets_ruby19] >=dev-ruby/rspec-mocks-2.12.0:2[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( >=dev-ruby/nokogiri-1.5.2[ruby_targets_ruby20] dev-ruby/syntax[ruby_targets_ruby20] >=dev-ruby/zentest-4.6.2[ruby_targets_ruby20] >=dev-ruby/rspec-expectations-2.14.0:2[ruby_targets_ruby20] >=dev-ruby/rspec-mocks-2.12.0:2[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/nokogiri-1.5.2[ruby_targets_ruby21] dev-ruby/syntax[ruby_targets_ruby21] >=dev-ruby/zentest-4.6.2[ruby_targets_ruby21] >=dev-ruby/rspec-expectations-2.14.0:2[ruby_targets_ruby21] >=dev-ruby/rspec-mocks-2.12.0:2[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( doc? ( dev-ruby/yard[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/yard[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) )
+DEPEND=ruby_targets_ruby20? ( test? ( >=dev-ruby/nokogiri-1.5.2[ruby_targets_ruby20] dev-ruby/syntax[ruby_targets_ruby20] >=dev-ruby/zentest-4.6.2[ruby_targets_ruby20] >=dev-ruby/rspec-expectations-2.14.0:2[ruby_targets_ruby20] >=dev-ruby/rspec-mocks-2.12.0:2[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/nokogiri-1.5.2[ruby_targets_ruby21] dev-ruby/syntax[ruby_targets_ruby21] >=dev-ruby/zentest-4.6.2[ruby_targets_ruby21] >=dev-ruby/rspec-expectations-2.14.0:2[ruby_targets_ruby21] >=dev-ruby/rspec-mocks-2.12.0:2[ruby_targets_ruby21] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/yard[ruby_targets_ruby20] ) ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby20? ( doc? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[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] ) )
 DESCRIPTION=A Behaviour Driven Development (BDD) framework for Ruby
 EAPI=5
 HOMEPAGE=http://rspec.rubyforge.org/
-IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 doc test test
 KEYWORDS=alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
+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=2
 SRC_URI=https://github.com/rspec/rspec-core/archive/v2.14.8.tar.gz -> rspec-core-2.14.8-git.tgz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	23ae8c186171e6476af098d2a50d0ee0	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=1e9d36c5e6efa1130f48ac6af66fa748
+_md5_=3afd7a9ed57c9f181822c56cd8ba35c1
diff --git a/metadata/md5-cache/dev-ruby/rspec-core-3.3.2 b/metadata/md5-cache/dev-ruby/rspec-core-3.3.2
index 13f624b72b47..740089b0f50c 100644
--- a/metadata/md5-cache/dev-ruby/rspec-core-3.3.2
+++ b/metadata/md5-cache/dev-ruby/rspec-core-3.3.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby19? ( =dev-ruby/rspec-support-3.3*[ruby_targets_ruby19] !!<dev-ruby/rspec-core-2.14.8-r4[ruby_targets_ruby19] highlight? ( >=dev-ruby/coderay-1.0.9[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( =dev-ruby/rspec-support-3.3*[ruby_targets_ruby20] !!<dev-ruby/rspec-core-2.14.8-r4[ruby_targets_ruby20] highlight? ( >=dev-ruby/coderay-1.0.9[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( =dev-ruby/rspec-support-3.3*[ruby_targets_ruby21] !!<dev-ruby/rspec-core-2.14.8-r4[ruby_targets_ruby21] highlight? ( >=dev-ruby/coderay-1.0.9[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( =dev-ruby/rspec-support-3.3*[ruby_targets_ruby22] !!<dev-ruby/rspec-core-2.14.8-r4[ruby_targets_ruby22] highlight? ( >=dev-ruby/coderay-1.0.9[ruby_targets_ruby22] ) ) ) ruby_targets_ruby19? ( test? ( >=dev-ruby/nokogiri-1.5.2[ruby_targets_ruby19] >=dev-ruby/coderay-1.0.9[ruby_targets_ruby19] dev-ruby/syntax[ruby_targets_ruby19] >=dev-ruby/zentest-4.6.2[ruby_targets_ruby19] >=dev-ruby/rspec-expectations-3.3.0:3[ruby_targets_ruby19] >=dev-ruby/rspec-mocks-2.99.0:3[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( >=dev-ruby/nokogiri-1.5.2[ruby_targets_ruby20] >=dev-ruby/coderay-1.0.9[ruby_targets_ruby20] dev-ruby/syntax[ruby_targets_ruby20] >=dev-ruby/zentest-4.6.2[ruby_targets_ruby20] >=dev-ruby/rspec-expectations-3.3.0:3[ruby_targets_ruby20] >=dev-ruby/rspec-mocks-2.99.0:3[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/nokogiri-1.5.2[ruby_targets_ruby21] >=dev-ruby/coderay-1.0.9[ruby_targets_ruby21] dev-ruby/syntax[ruby_targets_ruby21] >=dev-ruby/zentest-4.6.2[ruby_targets_ruby21] >=dev-ruby/rspec-expectations-3.3.0:3[ruby_targets_ruby21] >=dev-ruby/rspec-mocks-2.99.0:3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/nokogiri-1.5.2[ruby_targets_ruby22] >=dev-ruby/coderay-1.0.9[ruby_targets_ruby22] dev-ruby/syntax[ruby_targets_ruby22] >=dev-ruby/zentest-4.6.2[ruby_targets_ruby22] >=dev-ruby/rspec-expectations-3.3.0:3[ruby_targets_ruby22] >=dev-ruby/rspec-mocks-2.99.0:3[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( doc? ( dev-ruby/yard[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/yard[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/yard[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) 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_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) 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_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
+DEPEND=test? ( ruby_targets_ruby20? ( =dev-ruby/rspec-support-3.3*[ruby_targets_ruby20] !!<dev-ruby/rspec-core-2.14.8-r4[ruby_targets_ruby20] highlight? ( >=dev-ruby/coderay-1.0.9[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( =dev-ruby/rspec-support-3.3*[ruby_targets_ruby21] !!<dev-ruby/rspec-core-2.14.8-r4[ruby_targets_ruby21] highlight? ( >=dev-ruby/coderay-1.0.9[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( =dev-ruby/rspec-support-3.3*[ruby_targets_ruby22] !!<dev-ruby/rspec-core-2.14.8-r4[ruby_targets_ruby22] highlight? ( >=dev-ruby/coderay-1.0.9[ruby_targets_ruby22] ) ) ) ruby_targets_ruby20? ( test? ( >=dev-ruby/nokogiri-1.5.2[ruby_targets_ruby20] >=dev-ruby/coderay-1.0.9[ruby_targets_ruby20] dev-ruby/syntax[ruby_targets_ruby20] >=dev-ruby/zentest-4.6.2[ruby_targets_ruby20] >=dev-ruby/rspec-expectations-3.3.0:3[ruby_targets_ruby20] >=dev-ruby/rspec-mocks-2.99.0:3[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/nokogiri-1.5.2[ruby_targets_ruby21] >=dev-ruby/coderay-1.0.9[ruby_targets_ruby21] dev-ruby/syntax[ruby_targets_ruby21] >=dev-ruby/zentest-4.6.2[ruby_targets_ruby21] >=dev-ruby/rspec-expectations-3.3.0:3[ruby_targets_ruby21] >=dev-ruby/rspec-mocks-2.99.0:3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/nokogiri-1.5.2[ruby_targets_ruby22] >=dev-ruby/coderay-1.0.9[ruby_targets_ruby22] dev-ruby/syntax[ruby_targets_ruby22] >=dev-ruby/zentest-4.6.2[ruby_targets_ruby22] >=dev-ruby/rspec-expectations-3.3.0:3[ruby_targets_ruby22] >=dev-ruby/rspec-mocks-2.99.0:3[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/yard[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/yard[ruby_targets_ruby21] ) ) 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? ( doc? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[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=A Behaviour Driven Development (BDD) framework for Ruby
 EAPI=5
 HOMEPAGE=https://github.com/rspec/rspec-core
-IUSE=highlight test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+IUSE=highlight test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc test test
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby19? ( =dev-ruby/rspec-support-3.3*[ruby_targets_ruby19] !!<dev-ruby/rspec-core-2.14.8-r4[ruby_targets_ruby19] highlight? ( >=dev-ruby/coderay-1.0.9[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( =dev-ruby/rspec-support-3.3*[ruby_targets_ruby20] !!<dev-ruby/rspec-core-2.14.8-r4[ruby_targets_ruby20] highlight? ( >=dev-ruby/coderay-1.0.9[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( =dev-ruby/rspec-support-3.3*[ruby_targets_ruby21] !!<dev-ruby/rspec-core-2.14.8-r4[ruby_targets_ruby21] highlight? ( >=dev-ruby/coderay-1.0.9[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( =dev-ruby/rspec-support-3.3*[ruby_targets_ruby22] !!<dev-ruby/rspec-core-2.14.8-r4[ruby_targets_ruby22] highlight? ( >=dev-ruby/coderay-1.0.9[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) 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_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) 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_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
+RDEPEND=ruby_targets_ruby20? ( =dev-ruby/rspec-support-3.3*[ruby_targets_ruby20] !!<dev-ruby/rspec-core-2.14.8-r4[ruby_targets_ruby20] highlight? ( >=dev-ruby/coderay-1.0.9[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( =dev-ruby/rspec-support-3.3*[ruby_targets_ruby21] !!<dev-ruby/rspec-core-2.14.8-r4[ruby_targets_ruby21] highlight? ( >=dev-ruby/coderay-1.0.9[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( =dev-ruby/rspec-support-3.3*[ruby_targets_ruby22] !!<dev-ruby/rspec-core-2.14.8-r4[ruby_targets_ruby22] highlight? ( >=dev-ruby/coderay-1.0.9[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=3
 SRC_URI=https://github.com/rspec/rspec-core/archive/v3.3.2.tar.gz -> rspec-core-3.3.2-git.tgz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	23ae8c186171e6476af098d2a50d0ee0	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=953bd30bdb89c14af8994ec1d254feb0
+_md5_=9ea8d46152d93cbf0c1c2fbb733726fa
diff --git a/metadata/md5-cache/dev-ruby/rspec-rails-2.14.2 b/metadata/md5-cache/dev-ruby/rspec-rails-2.14.2
index 8fe99d3cc89f..6e6a1b62ad99 100644
--- a/metadata/md5-cache/dev-ruby/rspec-rails-2.14.2
+++ b/metadata/md5-cache/dev-ruby/rspec-rails-2.14.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby19? ( >=dev-ruby/activesupport-3.0[ruby_targets_ruby19] >=dev-ruby/activemodel-3.0[ruby_targets_ruby19] >=dev-ruby/actionpack-3.0[ruby_targets_ruby19] >=dev-ruby/railties-3.0[ruby_targets_ruby19] =dev-ruby/rspec-2.14*[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/activesupport-3.0[ruby_targets_ruby20] >=dev-ruby/activemodel-3.0[ruby_targets_ruby20] >=dev-ruby/actionpack-3.0[ruby_targets_ruby20] >=dev-ruby/railties-3.0[ruby_targets_ruby20] =dev-ruby/rspec-2.14*[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( test? ( =dev-ruby/mocha-0.10*[ruby_targets_ruby19] >=dev-ruby/capybara-2.0.0[ruby_targets_ruby19] >=dev-ruby/ammeter-0.2.5[ruby_targets_ruby19] ~dev-ruby/rspec-rails-2.14.2[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( =dev-ruby/mocha-0.10*[ruby_targets_ruby20] >=dev-ruby/capybara-2.0.0[ruby_targets_ruby20] >=dev-ruby/ammeter-0.2.5[ruby_targets_ruby20] ~dev-ruby/rspec-rails-2.14.2[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby20] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) )
+DEPEND=test? ( ruby_targets_ruby20? ( >=dev-ruby/activesupport-3.0[ruby_targets_ruby20] >=dev-ruby/activemodel-3.0[ruby_targets_ruby20] >=dev-ruby/actionpack-3.0[ruby_targets_ruby20] >=dev-ruby/railties-3.0[ruby_targets_ruby20] =dev-ruby/rspec-2.14*[ruby_targets_ruby20] ) ) ruby_targets_ruby20? ( test? ( =dev-ruby/mocha-0.10*[ruby_targets_ruby20] >=dev-ruby/capybara-2.0.0[ruby_targets_ruby20] >=dev-ruby/ammeter-0.2.5[ruby_targets_ruby20] ~dev-ruby/rspec-rails-2.14.2[ruby_targets_ruby20] ) ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby20] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby20] ) ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) )
 DESCRIPTION=RSpec's official Ruby on Rails plugin
 EAPI=5
 HOMEPAGE=http://rspec.info/
-IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby20 test test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/activesupport-3.0[ruby_targets_ruby19] >=dev-ruby/activemodel-3.0[ruby_targets_ruby19] >=dev-ruby/actionpack-3.0[ruby_targets_ruby19] >=dev-ruby/railties-3.0[ruby_targets_ruby19] =dev-ruby/rspec-2.14*[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/activesupport-3.0[ruby_targets_ruby20] >=dev-ruby/activemodel-3.0[ruby_targets_ruby20] >=dev-ruby/actionpack-3.0[ruby_targets_ruby20] >=dev-ruby/railties-3.0[ruby_targets_ruby20] =dev-ruby/rspec-2.14*[ruby_targets_ruby20] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
+RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/activesupport-3.0[ruby_targets_ruby20] >=dev-ruby/activemodel-3.0[ruby_targets_ruby20] >=dev-ruby/actionpack-3.0[ruby_targets_ruby20] >=dev-ruby/railties-3.0[ruby_targets_ruby20] =dev-ruby/rspec-2.14*[ruby_targets_ruby20] ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
+REQUIRED_USE=|| ( ruby_targets_ruby20 )
 SLOT=2
 SRC_URI=https://github.com/rspec/rspec-rails/archive/v2.14.2.tar.gz -> rspec-rails-2.14.2.tar.gz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	23ae8c186171e6476af098d2a50d0ee0	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=1abcd0b1c35b0b807913239dd8a98fe9
+_md5_=66e154a4c93ec275c9b46915c8398e80
diff --git a/metadata/md5-cache/dev-ruby/rspec-rails-2.99.0 b/metadata/md5-cache/dev-ruby/rspec-rails-2.99.0
index b56698f14f6c..93f6ab4742e4 100644
--- a/metadata/md5-cache/dev-ruby/rspec-rails-2.99.0
+++ b/metadata/md5-cache/dev-ruby/rspec-rails-2.99.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby19? ( >=dev-ruby/activesupport-3.0[ruby_targets_ruby19] >=dev-ruby/activemodel-3.0[ruby_targets_ruby19] >=dev-ruby/actionpack-3.0[ruby_targets_ruby19] >=dev-ruby/railties-3.0[ruby_targets_ruby19] =dev-ruby/rspec-2.99*[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/activesupport-3.0[ruby_targets_ruby20] >=dev-ruby/activemodel-3.0[ruby_targets_ruby20] >=dev-ruby/actionpack-3.0[ruby_targets_ruby20] >=dev-ruby/railties-3.0[ruby_targets_ruby20] =dev-ruby/rspec-2.99*[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/activesupport-3.0[ruby_targets_ruby21] >=dev-ruby/activemodel-3.0[ruby_targets_ruby21] >=dev-ruby/actionpack-3.0[ruby_targets_ruby21] >=dev-ruby/railties-3.0[ruby_targets_ruby21] =dev-ruby/rspec-2.99*[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( test? ( =dev-ruby/mocha-0.10*[ruby_targets_ruby19] >=dev-ruby/capybara-2.0.0[ruby_targets_ruby19] >=dev-ruby/ammeter-0.2.5[ruby_targets_ruby19] ~dev-ruby/rspec-rails-2.99.0[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( =dev-ruby/mocha-0.10*[ruby_targets_ruby20] >=dev-ruby/capybara-2.0.0[ruby_targets_ruby20] >=dev-ruby/ammeter-0.2.5[ruby_targets_ruby20] ~dev-ruby/rspec-rails-2.99.0[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( =dev-ruby/mocha-0.10*[ruby_targets_ruby21] >=dev-ruby/capybara-2.0.0[ruby_targets_ruby21] >=dev-ruby/ammeter-0.2.5[ruby_targets_ruby21] ~dev-ruby/rspec-rails-2.99.0[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby19] ) ) 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_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) )
+DEPEND=test? ( ruby_targets_ruby20? ( >=dev-ruby/activesupport-3.0[ruby_targets_ruby20] >=dev-ruby/activemodel-3.0[ruby_targets_ruby20] >=dev-ruby/actionpack-3.0[ruby_targets_ruby20] >=dev-ruby/railties-3.0[ruby_targets_ruby20] =dev-ruby/rspec-2.99*[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/activesupport-3.0[ruby_targets_ruby21] >=dev-ruby/activemodel-3.0[ruby_targets_ruby21] >=dev-ruby/actionpack-3.0[ruby_targets_ruby21] >=dev-ruby/railties-3.0[ruby_targets_ruby21] =dev-ruby/rspec-2.99*[ruby_targets_ruby21] ) ) ruby_targets_ruby20? ( test? ( =dev-ruby/mocha-0.10*[ruby_targets_ruby20] >=dev-ruby/capybara-2.0.0[ruby_targets_ruby20] >=dev-ruby/ammeter-0.2.5[ruby_targets_ruby20] ~dev-ruby/rspec-rails-2.99.0[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( =dev-ruby/mocha-0.10*[ruby_targets_ruby21] >=dev-ruby/capybara-2.0.0[ruby_targets_ruby21] >=dev-ruby/ammeter-0.2.5[ruby_targets_ruby21] ~dev-ruby/rspec-rails-2.99.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/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=RSpec's official Ruby on Rails plugin
 EAPI=5
 HOMEPAGE=http://rspec.info/
-IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/activesupport-3.0[ruby_targets_ruby19] >=dev-ruby/activemodel-3.0[ruby_targets_ruby19] >=dev-ruby/actionpack-3.0[ruby_targets_ruby19] >=dev-ruby/railties-3.0[ruby_targets_ruby19] =dev-ruby/rspec-2.99*[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/activesupport-3.0[ruby_targets_ruby20] >=dev-ruby/activemodel-3.0[ruby_targets_ruby20] >=dev-ruby/actionpack-3.0[ruby_targets_ruby20] >=dev-ruby/railties-3.0[ruby_targets_ruby20] =dev-ruby/rspec-2.99*[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/activesupport-3.0[ruby_targets_ruby21] >=dev-ruby/activemodel-3.0[ruby_targets_ruby21] >=dev-ruby/actionpack-3.0[ruby_targets_ruby21] >=dev-ruby/railties-3.0[ruby_targets_ruby21] =dev-ruby/rspec-2.99*[ruby_targets_ruby21] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
+RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/activesupport-3.0[ruby_targets_ruby20] >=dev-ruby/activemodel-3.0[ruby_targets_ruby20] >=dev-ruby/actionpack-3.0[ruby_targets_ruby20] >=dev-ruby/railties-3.0[ruby_targets_ruby20] =dev-ruby/rspec-2.99*[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/activesupport-3.0[ruby_targets_ruby21] >=dev-ruby/activemodel-3.0[ruby_targets_ruby21] >=dev-ruby/actionpack-3.0[ruby_targets_ruby21] >=dev-ruby/railties-3.0[ruby_targets_ruby21] =dev-ruby/rspec-2.99*[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=2
 SRC_URI=https://github.com/rspec/rspec-rails/archive/v2.99.0.tar.gz -> rspec-rails-2.99.0.tar.gz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	23ae8c186171e6476af098d2a50d0ee0	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=29c494bd603a7425a8f0aeb57cc49494
+_md5_=17bec99c100958cb65e7cbb93a22a454
diff --git a/metadata/md5-cache/dev-ruby/rspec-rails-3.3.3 b/metadata/md5-cache/dev-ruby/rspec-rails-3.3.3
index b5052b9106da..ed2f6eb0051f 100644
--- a/metadata/md5-cache/dev-ruby/rspec-rails-3.3.3
+++ b/metadata/md5-cache/dev-ruby/rspec-rails-3.3.3
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby19? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby19] >=dev-ruby/actionpack-3.0:*[ruby_targets_ruby19] >=dev-ruby/railties-3.0:*[ruby_targets_ruby19] =dev-ruby/rspec-3.3*[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby20] >=dev-ruby/actionpack-3.0:*[ruby_targets_ruby20] >=dev-ruby/railties-3.0:*[ruby_targets_ruby20] =dev-ruby/rspec-3.3*[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby21] >=dev-ruby/actionpack-3.0:*[ruby_targets_ruby21] >=dev-ruby/railties-3.0:*[ruby_targets_ruby21] =dev-ruby/rspec-3.3*[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( test? ( =dev-ruby/mocha-0.10*[ruby_targets_ruby19] >=dev-ruby/capybara-2.0.0[ruby_targets_ruby19] >=dev-ruby/ammeter-1.1.2[ruby_targets_ruby19] ~dev-ruby/rspec-rails-3.3.3[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( =dev-ruby/mocha-0.10*[ruby_targets_ruby20] >=dev-ruby/capybara-2.0.0[ruby_targets_ruby20] >=dev-ruby/ammeter-1.1.2[ruby_targets_ruby20] ~dev-ruby/rspec-rails-3.3.3[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( =dev-ruby/mocha-0.10*[ruby_targets_ruby21] >=dev-ruby/capybara-2.0.0[ruby_targets_ruby21] >=dev-ruby/ammeter-1.1.2[ruby_targets_ruby21] ~dev-ruby/rspec-rails-3.3.3[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) )
+DEPEND=test? ( ruby_targets_ruby20? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby20] >=dev-ruby/actionpack-3.0:*[ruby_targets_ruby20] >=dev-ruby/railties-3.0:*[ruby_targets_ruby20] =dev-ruby/rspec-3.3*[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby21] >=dev-ruby/actionpack-3.0:*[ruby_targets_ruby21] >=dev-ruby/railties-3.0:*[ruby_targets_ruby21] =dev-ruby/rspec-3.3*[ruby_targets_ruby21] ) ) ruby_targets_ruby20? ( test? ( =dev-ruby/mocha-0.10*[ruby_targets_ruby20] >=dev-ruby/capybara-2.0.0[ruby_targets_ruby20] >=dev-ruby/ammeter-1.1.2[ruby_targets_ruby20] ~dev-ruby/rspec-rails-3.3.3[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( =dev-ruby/mocha-0.10*[ruby_targets_ruby21] >=dev-ruby/capybara-2.0.0[ruby_targets_ruby21] >=dev-ruby/ammeter-1.1.2[ruby_targets_ruby21] ~dev-ruby/rspec-rails-3.3.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/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=RSpec's official Ruby on Rails plugin
 EAPI=5
 HOMEPAGE=http://rspec.info/
-IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 test test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby19] >=dev-ruby/actionpack-3.0:*[ruby_targets_ruby19] >=dev-ruby/railties-3.0:*[ruby_targets_ruby19] =dev-ruby/rspec-3.3*[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby20] >=dev-ruby/actionpack-3.0:*[ruby_targets_ruby20] >=dev-ruby/railties-3.0:*[ruby_targets_ruby20] =dev-ruby/rspec-3.3*[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby21] >=dev-ruby/actionpack-3.0:*[ruby_targets_ruby21] >=dev-ruby/railties-3.0:*[ruby_targets_ruby21] =dev-ruby/rspec-3.3*[ruby_targets_ruby21] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
+RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby20] >=dev-ruby/actionpack-3.0:*[ruby_targets_ruby20] >=dev-ruby/railties-3.0:*[ruby_targets_ruby20] =dev-ruby/rspec-3.3*[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby21] >=dev-ruby/actionpack-3.0:*[ruby_targets_ruby21] >=dev-ruby/railties-3.0:*[ruby_targets_ruby21] =dev-ruby/rspec-3.3*[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=https://github.com/rspec/rspec-rails/archive/v3.3.3.tar.gz -> rspec-rails-3.3.3.tar.gz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	23ae8c186171e6476af098d2a50d0ee0	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=387603a4304d93b5b45d639f47fe8055
+_md5_=539142bc90fcc53672d985ba5967ad92
diff --git a/metadata/md5-cache/dev-ruby/ruby-glib2-2.2.3 b/metadata/md5-cache/dev-ruby/ruby-glib2-2.2.3
index 908d82058aaa..e30d4d33c12d 100644
--- a/metadata/md5-cache/dev-ruby/ruby-glib2-2.2.3
+++ b/metadata/md5-cache/dev-ruby/ruby-glib2-2.2.3
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=dev-libs/glib-2 ruby_targets_ruby19? ( dev-ruby/pkg-config[ruby_targets_ruby19] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( dev-ruby/pkg-config[ruby_targets_ruby20] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ) virtual/pkgconfig ruby_targets_ruby19? ( dev-ruby/pkg-config[ruby_targets_ruby19] ) ruby_targets_ruby20? ( dev-ruby/pkg-config[ruby_targets_ruby20] )
+DEPEND=>=dev-libs/glib-2 ruby_targets_ruby20? ( dev-ruby/pkg-config[ruby_targets_ruby20] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby20] ) ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ) virtual/pkgconfig ruby_targets_ruby20? ( dev-ruby/pkg-config[ruby_targets_ruby20] )
 DESCRIPTION=Ruby Glib2 bindings
 EAPI=5
 HOMEPAGE=http://ruby-gnome2.sourceforge.jp/
-IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 test
+IUSE=elibc_FreeBSD ruby_targets_ruby20 test
 KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=Ruby
-RDEPEND=>=dev-libs/glib-2 ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
+RDEPEND=>=dev-libs/glib-2 ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
+REQUIRED_USE=|| ( ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-2.2.3.tar.gz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	23ae8c186171e6476af098d2a50d0ee0	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=abc5561441975e78378805babb9b0b07
+_md5_=33e724652d43b9447eed516c62752dcd
diff --git a/metadata/md5-cache/dev-ruby/ruby-glib2-2.2.3-r1 b/metadata/md5-cache/dev-ruby/ruby-glib2-2.2.3-r1
index 9521c37bd2ca..5d9003e5b980 100644
--- a/metadata/md5-cache/dev-ruby/ruby-glib2-2.2.3-r1
+++ b/metadata/md5-cache/dev-ruby/ruby-glib2-2.2.3-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=dev-libs/glib-2 ruby_targets_ruby19? ( dev-ruby/pkg-config[ruby_targets_ruby19] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( dev-ruby/pkg-config[ruby_targets_ruby20] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( dev-ruby/pkg-config[ruby_targets_ruby21] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( dev-ruby/pkg-config[ruby_targets_ruby22] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) 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_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) 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_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ) virtual/pkgconfig ruby_targets_ruby19? ( dev-ruby/pkg-config[ruby_targets_ruby19] ) ruby_targets_ruby20? ( dev-ruby/pkg-config[ruby_targets_ruby20] ) ruby_targets_ruby21? ( dev-ruby/pkg-config[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/pkg-config[ruby_targets_ruby22] )
+DEPEND=>=dev-libs/glib-2 ruby_targets_ruby20? ( dev-ruby/pkg-config[ruby_targets_ruby20] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( dev-ruby/pkg-config[ruby_targets_ruby21] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( dev-ruby/pkg-config[ruby_targets_ruby22] test? ( >=dev-ruby/test-unit-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] ) 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] ) ) virtual/pkgconfig ruby_targets_ruby20? ( dev-ruby/pkg-config[ruby_targets_ruby20] ) ruby_targets_ruby21? ( dev-ruby/pkg-config[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/pkg-config[ruby_targets_ruby22] )
 DESCRIPTION=Ruby Glib2 bindings
 EAPI=5
 HOMEPAGE=http://ruby-gnome2.sourceforge.jp/
-IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 test
+IUSE=elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 test
 KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
 LICENSE=Ruby
-RDEPEND=>=dev-libs/glib-2 ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) 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_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) 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_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
+RDEPEND=>=dev-libs/glib-2 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://sourceforge/ruby-gnome2/ruby-gnome2-all-2.2.3.tar.gz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	23ae8c186171e6476af098d2a50d0ee0	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=49557881a56ac0e8b8791d5982e55ecc
+_md5_=f149178816fc6c0595d50c749cb34fa7
diff --git a/metadata/md5-cache/dev-ruby/ruby-glib2-2.2.5 b/metadata/md5-cache/dev-ruby/ruby-glib2-2.2.5
index 2274f60c7707..0f8404b77609 100644
--- a/metadata/md5-cache/dev-ruby/ruby-glib2-2.2.5
+++ b/metadata/md5-cache/dev-ruby/ruby-glib2-2.2.5
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=dev-libs/glib-2 ruby_targets_ruby19? ( dev-ruby/pkg-config[ruby_targets_ruby19] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( dev-ruby/pkg-config[ruby_targets_ruby20] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( dev-ruby/pkg-config[ruby_targets_ruby21] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( dev-ruby/pkg-config[ruby_targets_ruby22] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) 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_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) 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_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ) virtual/pkgconfig ruby_targets_ruby19? ( dev-ruby/pkg-config[ruby_targets_ruby19] ) ruby_targets_ruby20? ( dev-ruby/pkg-config[ruby_targets_ruby20] ) ruby_targets_ruby21? ( dev-ruby/pkg-config[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/pkg-config[ruby_targets_ruby22] )
+DEPEND=>=dev-libs/glib-2 ruby_targets_ruby20? ( dev-ruby/pkg-config[ruby_targets_ruby20] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( dev-ruby/pkg-config[ruby_targets_ruby21] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( dev-ruby/pkg-config[ruby_targets_ruby22] test? ( >=dev-ruby/test-unit-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] ) 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] ) ) virtual/pkgconfig ruby_targets_ruby20? ( dev-ruby/pkg-config[ruby_targets_ruby20] ) ruby_targets_ruby21? ( dev-ruby/pkg-config[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/pkg-config[ruby_targets_ruby22] )
 DESCRIPTION=Ruby Glib2 bindings
 EAPI=5
 HOMEPAGE=http://ruby-gnome2.sourceforge.jp/
-IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 test
+IUSE=elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 test
 KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
 LICENSE=Ruby
-RDEPEND=>=dev-libs/glib-2 ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) 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_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) 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_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
+RDEPEND=>=dev-libs/glib-2 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://sourceforge/ruby-gnome2/ruby-gnome2-all-2.2.5.tar.gz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	23ae8c186171e6476af098d2a50d0ee0	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=6f0851d7fc780cf83345ceb1573b513b
+_md5_=0e0bf9496569241d841e43d95d86b27c
diff --git a/metadata/md5-cache/dev-ruby/sanitize-2.0.6-r1 b/metadata/md5-cache/dev-ruby/sanitize-2.0.6-r1
index 54fe08f2a827..289f8877eca7 100644
--- a/metadata/md5-cache/dev-ruby/sanitize-2.0.6-r1
+++ b/metadata/md5-cache/dev-ruby/sanitize-2.0.6-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby19? ( dev-ruby/nokogiri[ruby_targets_ruby19] ) ruby_targets_ruby20? ( dev-ruby/nokogiri[ruby_targets_ruby20] ) ruby_targets_ruby21? ( dev-ruby/nokogiri[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/minitest[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/minitest[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/minitest[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) )
+DEPEND=test? ( ruby_targets_ruby20? ( dev-ruby/nokogiri[ruby_targets_ruby20] ) ruby_targets_ruby21? ( dev-ruby/nokogiri[ruby_targets_ruby21] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/minitest[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/minitest[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] ) )
 DESCRIPTION=Sanitize is a whitelist-based HTML sanitizer
 EAPI=5
 HOMEPAGE=https://github.com/rgrove/sanitize
-IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 test test
 KEYWORDS=~amd64 ~x86 ~x86-macos
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby19? ( dev-ruby/nokogiri[ruby_targets_ruby19] ) ruby_targets_ruby20? ( dev-ruby/nokogiri[ruby_targets_ruby20] ) ruby_targets_ruby21? ( dev-ruby/nokogiri[ruby_targets_ruby21] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
+RDEPEND=ruby_targets_ruby20? ( dev-ruby/nokogiri[ruby_targets_ruby20] ) ruby_targets_ruby21? ( dev-ruby/nokogiri[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=https://github.com/rgrove/sanitize/archive/v2.0.6.tar.gz -> sanitize-2.0.6.tar.gz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	23ae8c186171e6476af098d2a50d0ee0	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=aae78a8ee2cff81f8018679e37d557f6
+_md5_=de4590b448c39e8b4fe35b5d1032c6e7
diff --git a/metadata/md5-cache/dev-ruby/sanitize-2.1.0 b/metadata/md5-cache/dev-ruby/sanitize-2.1.0
index 4d5ec5273eba..a356af8ab28c 100644
--- a/metadata/md5-cache/dev-ruby/sanitize-2.1.0
+++ b/metadata/md5-cache/dev-ruby/sanitize-2.1.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby19? ( >=dev-ruby/nokogiri-1.4.4[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/nokogiri-1.4.4[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/nokogiri-1.4.4[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/nokogiri-1.4.4[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/minitest[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/minitest[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/minitest[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) 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_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) 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_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
+DEPEND=test? ( ruby_targets_ruby20? ( >=dev-ruby/nokogiri-1.4.4[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/nokogiri-1.4.4[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/nokogiri-1.4.4[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/minitest[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/minitest[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest[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/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[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=Sanitize is a whitelist-based HTML sanitizer
 EAPI=5
 HOMEPAGE=https://github.com/rgrove/sanitize
-IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 test test
 KEYWORDS=~amd64 ~x86 ~x86-macos
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/nokogiri-1.4.4[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/nokogiri-1.4.4[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/nokogiri-1.4.4[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/nokogiri-1.4.4[ruby_targets_ruby22] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) 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_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) 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_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
+RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/nokogiri-1.4.4[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/nokogiri-1.4.4[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/nokogiri-1.4.4[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/sanitize-2.1.0.gem
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	23ae8c186171e6476af098d2a50d0ee0	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=ff613754310367c4c028e2a3d65c4fcb
+_md5_=67ceaabdbce762ee07df8e72192682cc
diff --git a/metadata/md5-cache/dev-ruby/sanitize-4.0.0-r1 b/metadata/md5-cache/dev-ruby/sanitize-4.0.0-r1
index ca236a762b6f..2256b01856e0 100644
--- a/metadata/md5-cache/dev-ruby/sanitize-4.0.0-r1
+++ b/metadata/md5-cache/dev-ruby/sanitize-4.0.0-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby19? ( >=dev-ruby/crass-1.0.2[ruby_targets_ruby19] =dev-ruby/crass-1.0*[ruby_targets_ruby19] >=dev-ruby/nokogiri-1.4.4[ruby_targets_ruby19] >=dev-ruby/nokogumbo-1.4.1[ruby_targets_ruby19] =dev-ruby/nokogumbo-1.4*[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/crass-1.0.2[ruby_targets_ruby20] =dev-ruby/crass-1.0*[ruby_targets_ruby20] >=dev-ruby/nokogiri-1.4.4[ruby_targets_ruby20] >=dev-ruby/nokogumbo-1.4.1[ruby_targets_ruby20] =dev-ruby/nokogumbo-1.4*[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/crass-1.0.2[ruby_targets_ruby21] =dev-ruby/crass-1.0*[ruby_targets_ruby21] >=dev-ruby/nokogiri-1.4.4[ruby_targets_ruby21] >=dev-ruby/nokogumbo-1.4.1[ruby_targets_ruby21] =dev-ruby/nokogumbo-1.4*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/crass-1.0.2[ruby_targets_ruby22] =dev-ruby/crass-1.0*[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.4.4[ruby_targets_ruby22] >=dev-ruby/nokogumbo-1.4.1[ruby_targets_ruby22] =dev-ruby/nokogumbo-1.4*[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/minitest[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/minitest[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/minitest[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) 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_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) 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_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
+DEPEND=test? ( ruby_targets_ruby20? ( >=dev-ruby/crass-1.0.2[ruby_targets_ruby20] =dev-ruby/crass-1.0*[ruby_targets_ruby20] >=dev-ruby/nokogiri-1.4.4[ruby_targets_ruby20] >=dev-ruby/nokogumbo-1.4.1[ruby_targets_ruby20] =dev-ruby/nokogumbo-1.4*[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/crass-1.0.2[ruby_targets_ruby21] =dev-ruby/crass-1.0*[ruby_targets_ruby21] >=dev-ruby/nokogiri-1.4.4[ruby_targets_ruby21] >=dev-ruby/nokogumbo-1.4.1[ruby_targets_ruby21] =dev-ruby/nokogumbo-1.4*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/crass-1.0.2[ruby_targets_ruby22] =dev-ruby/crass-1.0*[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.4.4[ruby_targets_ruby22] >=dev-ruby/nokogumbo-1.4.1[ruby_targets_ruby22] =dev-ruby/nokogumbo-1.4*[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/minitest[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/minitest[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest[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/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[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=Sanitize is a whitelist-based HTML sanitizer
 EAPI=5
 HOMEPAGE=https://github.com/rgrove/sanitize
-IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 test test
 KEYWORDS=~amd64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/crass-1.0.2[ruby_targets_ruby19] =dev-ruby/crass-1.0*[ruby_targets_ruby19] >=dev-ruby/nokogiri-1.4.4[ruby_targets_ruby19] >=dev-ruby/nokogumbo-1.4.1[ruby_targets_ruby19] =dev-ruby/nokogumbo-1.4*[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/crass-1.0.2[ruby_targets_ruby20] =dev-ruby/crass-1.0*[ruby_targets_ruby20] >=dev-ruby/nokogiri-1.4.4[ruby_targets_ruby20] >=dev-ruby/nokogumbo-1.4.1[ruby_targets_ruby20] =dev-ruby/nokogumbo-1.4*[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/crass-1.0.2[ruby_targets_ruby21] =dev-ruby/crass-1.0*[ruby_targets_ruby21] >=dev-ruby/nokogiri-1.4.4[ruby_targets_ruby21] >=dev-ruby/nokogumbo-1.4.1[ruby_targets_ruby21] =dev-ruby/nokogumbo-1.4*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/crass-1.0.2[ruby_targets_ruby22] =dev-ruby/crass-1.0*[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.4.4[ruby_targets_ruby22] >=dev-ruby/nokogumbo-1.4.1[ruby_targets_ruby22] =dev-ruby/nokogumbo-1.4*[ruby_targets_ruby22] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) 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_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) 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_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
+RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/crass-1.0.2[ruby_targets_ruby20] =dev-ruby/crass-1.0*[ruby_targets_ruby20] >=dev-ruby/nokogiri-1.4.4[ruby_targets_ruby20] >=dev-ruby/nokogumbo-1.4.1[ruby_targets_ruby20] =dev-ruby/nokogumbo-1.4*[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/crass-1.0.2[ruby_targets_ruby21] =dev-ruby/crass-1.0*[ruby_targets_ruby21] >=dev-ruby/nokogiri-1.4.4[ruby_targets_ruby21] >=dev-ruby/nokogumbo-1.4.1[ruby_targets_ruby21] =dev-ruby/nokogumbo-1.4*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/crass-1.0.2[ruby_targets_ruby22] =dev-ruby/crass-1.0*[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.4.4[ruby_targets_ruby22] >=dev-ruby/nokogumbo-1.4.1[ruby_targets_ruby22] =dev-ruby/nokogumbo-1.4*[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=4
 SRC_URI=https://github.com/rgrove/sanitize/archive/v4.0.0.tar.gz -> sanitize-4.0.0.tar.gz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	23ae8c186171e6476af098d2a50d0ee0	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=ff9b7f6e1999015da259490384211f2b
+_md5_=975dc5b4c745cd44d08ae0870d755bd6
diff --git a/metadata/md5-cache/dev-ruby/sparklines-0.5.2-r4 b/metadata/md5-cache/dev-ruby/sparklines-0.5.2-r4
index dac7990a12db..5bff7cd8da9d 100644
--- a/metadata/md5-cache/dev-ruby/sparklines-0.5.2-r4
+++ b/metadata/md5-cache/dev-ruby/sparklines-0.5.2-r4
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby19? ( test? ( dev-ruby/tidy_table[ruby_targets_ruby19] dev-ruby/dust[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/tidy_table[ruby_targets_ruby20] dev-ruby/dust[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) )
+DEPEND=ruby_targets_ruby20? ( test? ( dev-ruby/tidy_table[ruby_targets_ruby20] dev-ruby/dust[ruby_targets_ruby20] ) ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) )
 DESCRIPTION=Create sparklines, small graphs to be used inline in texts
 EAPI=5
 HOMEPAGE=http://sparklines.rubyforge.org/
-IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby20 test test
 KEYWORDS=amd64 x86 ~x86-macos
 LICENSE=MIT
-RDEPEND=dev-ruby/rmagick ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
+RDEPEND=dev-ruby/rmagick ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
+REQUIRED_USE=|| ( ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/sparklines-0.5.2.gem
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	23ae8c186171e6476af098d2a50d0ee0	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=092d814869448129d161e8fbd1841d73
+_md5_=c6ea0856785bc90aae74a3cf2f612fd4
diff --git a/metadata/md5-cache/dev-ruby/temple-0.6.10 b/metadata/md5-cache/dev-ruby/temple-0.6.10
index b49826efdd74..61caab32ed08 100644
--- a/metadata/md5-cache/dev-ruby/temple-0.6.10
+++ b/metadata/md5-cache/dev-ruby/temple-0.6.10
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby19? ( test? ( dev-ruby/bacon[ruby_targets_ruby19] dev-ruby/tilt[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/bacon[ruby_targets_ruby20] dev-ruby/tilt[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/bacon[ruby_targets_ruby21] dev-ruby/tilt[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/bacon[ruby_targets_ruby22] dev-ruby/tilt[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) 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_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) 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_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
+DEPEND=ruby_targets_ruby20? ( test? ( dev-ruby/bacon[ruby_targets_ruby20] dev-ruby/tilt[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/bacon[ruby_targets_ruby21] dev-ruby/tilt[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/bacon[ruby_targets_ruby22] dev-ruby/tilt[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] ) 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=An abstraction and a framework for compiling templates to pure Ruby
 EAPI=5
 HOMEPAGE=https://github.com/judofyr/temple
-IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 test
+IUSE=elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) 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_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) 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_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
+RDEPEND=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/temple-0.6.10.gem
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	23ae8c186171e6476af098d2a50d0ee0	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=91bef8ee112169405ee4e7abf21995e7
+_md5_=a8a6c40f27c974f503e3a4bd54e70e54
diff --git a/metadata/md5-cache/dev-ruby/temple-0.7.6 b/metadata/md5-cache/dev-ruby/temple-0.7.6
index 55c41d9b24e7..1797a7e29320 100644
--- a/metadata/md5-cache/dev-ruby/temple-0.7.6
+++ b/metadata/md5-cache/dev-ruby/temple-0.7.6
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby19? ( test? ( dev-ruby/bacon[ruby_targets_ruby19] dev-ruby/erubis[ruby_targets_ruby19] >=dev-ruby/tilt-2.0.1[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/bacon[ruby_targets_ruby20] dev-ruby/erubis[ruby_targets_ruby20] >=dev-ruby/tilt-2.0.1[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/bacon[ruby_targets_ruby21] dev-ruby/erubis[ruby_targets_ruby21] >=dev-ruby/tilt-2.0.1[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/bacon[ruby_targets_ruby22] dev-ruby/erubis[ruby_targets_ruby22] >=dev-ruby/tilt-2.0.1[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) 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_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) 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_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
+DEPEND=ruby_targets_ruby20? ( test? ( dev-ruby/bacon[ruby_targets_ruby20] dev-ruby/erubis[ruby_targets_ruby20] >=dev-ruby/tilt-2.0.1[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/bacon[ruby_targets_ruby21] dev-ruby/erubis[ruby_targets_ruby21] >=dev-ruby/tilt-2.0.1[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/bacon[ruby_targets_ruby22] dev-ruby/erubis[ruby_targets_ruby22] >=dev-ruby/tilt-2.0.1[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] ) 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=An abstraction and a framework for compiling templates to pure Ruby
 EAPI=5
 HOMEPAGE=https://github.com/judofyr/temple
-IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 test
+IUSE=elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) 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_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) 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_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
+RDEPEND=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.7
 SRC_URI=mirror://rubygems/temple-0.7.6.gem
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	23ae8c186171e6476af098d2a50d0ee0	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=fb8271f8be4b342832d9f5b6ece8bfab
+_md5_=e73d4a6f2dfd02054825364a5908ed69
diff --git a/metadata/md5-cache/dev-ruby/term-ansicolor-1.2.2-r1 b/metadata/md5-cache/dev-ruby/term-ansicolor-1.2.2-r1
index 66637683e95b..8e017d8e3937 100644
--- a/metadata/md5-cache/dev-ruby/term-ansicolor-1.2.2-r1
+++ b/metadata/md5-cache/dev-ruby/term-ansicolor-1.2.2-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) )
+DEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby20? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) )
 DESCRIPTION=Small Ruby library that colors strings using ANSI escape sequences
 EAPI=5
 HOMEPAGE=http://term-ansicolor.rubyforge.org/
-IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 doc test
+IUSE=elibc_FreeBSD ruby_targets_ruby20 doc test
 KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
-RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
+RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
+REQUIRED_USE=|| ( ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/term-ansicolor-1.2.2.gem
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	23ae8c186171e6476af098d2a50d0ee0	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=0f75eeca096e4064456c48b6cc4a664e
+_md5_=490a1e0fc234e9e15379c44f6059d47d
diff --git a/metadata/md5-cache/dev-ruby/term-ansicolor-1.3.0 b/metadata/md5-cache/dev-ruby/term-ansicolor-1.3.0
index e0f3c8a75d14..1cc9b2470a9c 100644
--- a/metadata/md5-cache/dev-ruby/term-ansicolor-1.3.0
+++ b/metadata/md5-cache/dev-ruby/term-ansicolor-1.3.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) 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_ruby19? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) 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_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
+DEPEND=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? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[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=Small Ruby library that colors strings using ANSI escape sequences
 EAPI=5
 HOMEPAGE=http://term-ansicolor.rubyforge.org/
-IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc test
+IUSE=elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc test
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
-RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) 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_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) 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_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
+RDEPEND=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/term-ansicolor-1.3.0.gem
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	23ae8c186171e6476af098d2a50d0ee0	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=64a32da9d9895c9f75383ba5c6f2c4bf
+_md5_=2da367bd988a379ed072a668b201cf70
diff --git a/metadata/md5-cache/dev-ruby/tins-0.13.1 b/metadata/md5-cache/dev-ruby/tins-0.13.1
index 65b4dd177017..034feb33a3da 100644
--- a/metadata/md5-cache/dev-ruby/tins-0.13.1
+++ b/metadata/md5-cache/dev-ruby/tins-0.13.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby19? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) )
+DEPEND=ruby_targets_ruby20? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby20] ) ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) )
 DESCRIPTION=All the stuff that isn't good enough for a real library
 EAPI=5
 HOMEPAGE=https://github.com/flori/tins
-IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 test
+IUSE=elibc_FreeBSD ruby_targets_ruby20 test
 KEYWORDS=~alpha amd64 hppa ppc ppc64 ~sparc x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
+RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
+REQUIRED_USE=|| ( ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/tins-0.13.1.gem
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	23ae8c186171e6476af098d2a50d0ee0	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=b271e5d310039b08f3a41c16c7fe6a22
+_md5_=e7236849968316460e797c632a8d5852
diff --git a/metadata/md5-cache/dev-ruby/typhoeus-0.7.3 b/metadata/md5-cache/dev-ruby/typhoeus-0.7.3
index bef1d3d00e43..5d0076a78950 100644
--- a/metadata/md5-cache/dev-ruby/typhoeus-0.7.3
+++ b/metadata/md5-cache/dev-ruby/typhoeus-0.7.3
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby19? ( >=dev-ruby/ethon-0.7.4[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/ethon-0.7.4[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/ethon-0.7.4[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/json[ruby_targets_ruby19] >=dev-ruby/faraday-0.9[ruby_targets_ruby19] >=dev-ruby/sinatra-1.3[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/json[ruby_targets_ruby20] >=dev-ruby/faraday-0.9[ruby_targets_ruby20] >=dev-ruby/sinatra-1.3[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/json[ruby_targets_ruby21] >=dev-ruby/faraday-0.9[ruby_targets_ruby21] >=dev-ruby/sinatra-1.3[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) )
+DEPEND=test? ( ruby_targets_ruby20? ( >=dev-ruby/ethon-0.7.4[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/ethon-0.7.4[ruby_targets_ruby21] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/json[ruby_targets_ruby20] >=dev-ruby/faraday-0.9[ruby_targets_ruby20] >=dev-ruby/sinatra-1.3[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/json[ruby_targets_ruby21] >=dev-ruby/faraday-0.9[ruby_targets_ruby21] >=dev-ruby/sinatra-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/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=Runs HTTP requests in parallel while cleanly encapsulating handling logic
 EAPI=5
 HOMEPAGE=http://rubygems.org/gems/typhoeus/
-IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 test test
 KEYWORDS=~amd64
 LICENSE=Ruby
-RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/ethon-0.7.4[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/ethon-0.7.4[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/ethon-0.7.4[ruby_targets_ruby21] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
+RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/ethon-0.7.4[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/ethon-0.7.4[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/typhoeus-0.7.3.gem
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	23ae8c186171e6476af098d2a50d0ee0	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=b58c3b18fa440a55a2875586738fae53
+_md5_=a9c7efabf48bef95f2df0fa0f88c82ae
diff --git a/metadata/md5-cache/dev-ruby/typhoeus-0.8.0 b/metadata/md5-cache/dev-ruby/typhoeus-0.8.0
index 7c3667c12794..626bc719b0bf 100644
--- a/metadata/md5-cache/dev-ruby/typhoeus-0.8.0
+++ b/metadata/md5-cache/dev-ruby/typhoeus-0.8.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby19? ( >=dev-ruby/ethon-0.8.0[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/ethon-0.8.0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/ethon-0.8.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ethon-0.8.0[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/json[ruby_targets_ruby19] >=dev-ruby/faraday-0.9[ruby_targets_ruby19] >=dev-ruby/sinatra-1.3[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/json[ruby_targets_ruby20] >=dev-ruby/faraday-0.9[ruby_targets_ruby20] >=dev-ruby/sinatra-1.3[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/json[ruby_targets_ruby21] >=dev-ruby/faraday-0.9[ruby_targets_ruby21] >=dev-ruby/sinatra-1.3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/json[ruby_targets_ruby22] >=dev-ruby/faraday-0.9[ruby_targets_ruby22] >=dev-ruby/sinatra-1.3[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) 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_ruby19? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby19] ) ) 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_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) 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_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
+DEPEND=test? ( ruby_targets_ruby20? ( >=dev-ruby/ethon-0.8.0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/ethon-0.8.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ethon-0.8.0[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/json[ruby_targets_ruby20] >=dev-ruby/faraday-0.9[ruby_targets_ruby20] >=dev-ruby/sinatra-1.3[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/json[ruby_targets_ruby21] >=dev-ruby/faraday-0.9[ruby_targets_ruby21] >=dev-ruby/sinatra-1.3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/json[ruby_targets_ruby22] >=dev-ruby/faraday-0.9[ruby_targets_ruby22] >=dev-ruby/sinatra-1.3[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=Runs HTTP requests in parallel while cleanly encapsulating handling logic
 EAPI=5
 HOMEPAGE=http://rubygems.org/gems/typhoeus/
-IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 test test
 KEYWORDS=~amd64
 LICENSE=Ruby
-RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/ethon-0.8.0[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/ethon-0.8.0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/ethon-0.8.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ethon-0.8.0[ruby_targets_ruby22] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) 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_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) 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_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
+RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/ethon-0.8.0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/ethon-0.8.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ethon-0.8.0[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/typhoeus-0.8.0.gem
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	23ae8c186171e6476af098d2a50d0ee0	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=f32b28368c3eaa34766ed54e27aeb1fa
+_md5_=14652fc51b11956b76746dcc5c25a491
diff --git a/metadata/md5-cache/dev-tex/latexdiff-1.1.1 b/metadata/md5-cache/dev-tex/latexdiff-1.1.1
new file mode 100644
index 000000000000..2308b9c2e8c2
--- /dev/null
+++ b/metadata/md5-cache/dev-tex/latexdiff-1.1.1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install test
+DEPEND=>=dev-lang/perl-5.8 dev-perl/Algorithm-Diff app-arch/unzip
+DESCRIPTION=Compare two latex files and mark up significant differences
+EAPI=5
+HOMEPAGE=http://www.ctan.org/tex-archive/support/latexdiff/ https://github.com/ftilmann/latexdiff/
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=GPL-2
+RDEPEND=>=dev-lang/perl-5.8 dev-perl/Algorithm-Diff
+SLOT=0
+SRC_URI=http://mirror.ctan.org/support/latexdiff.zip -> latexdiff-1.1.1.zip
+_md5_=3394ec2318f087e71f06ebfe4f587298
diff --git a/metadata/md5-cache/dev-util/ccache-3.2.5 b/metadata/md5-cache/dev-util/ccache-3.2.5
new file mode 100644
index 000000000000..9994d16d7377
--- /dev/null
+++ b/metadata/md5-cache/dev-util/ccache-3.2.5
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst prepare prerm
+DEPEND=app-arch/xz-utils sys-libs/zlib
+DESCRIPTION=fast compiler cache
+EAPI=5
+HOMEPAGE=http://ccache.samba.org/
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-3
+RDEPEND=app-arch/xz-utils sys-libs/zlib sys-apps/gentoo-functions
+SLOT=0
+SRC_URI=http://samba.org/ftp/ccache/ccache-3.2.5.tar.xz
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	multilib	23ae8c186171e6476af098d2a50d0ee0	readme.gentoo-r1	03878c06495db70bc36bd717383c09f7	toolchain-funcs	d513d423d449877e49d99af3f7af7acb
+_md5_=eb09737e597b4fe04da94307b2a3334f
diff --git a/metadata/md5-cache/dev-vcs/blogc-git-receiver-0.3.1 b/metadata/md5-cache/dev-vcs/blogc-git-receiver-0.4.0
similarity index 61%
rename from metadata/md5-cache/dev-vcs/blogc-git-receiver-0.3.1
rename to metadata/md5-cache/dev-vcs/blogc-git-receiver-0.4.0
index bf70d44cf9d4..26e2b4eff988 100644
--- a/metadata/md5-cache/dev-vcs/blogc-git-receiver-0.3.1
+++ b/metadata/md5-cache/dev-vcs/blogc-git-receiver-0.4.0
@@ -1,11 +1,11 @@
 DEFINED_PHASES=configure prepare
-DEPEND=>=dev-libs/squareball-0.1
+DEPEND=>=dev-libs/squareball-0.2.0
 DESCRIPTION=A simple login shell/git hook to deploy blogc websites
 EAPI=6
 HOMEPAGE=https://github.com/blogc/blogc-git-receiver
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
-RDEPEND=>=dev-libs/squareball-0.1 dev-vcs/git
+RDEPEND=>=dev-libs/squareball-0.2.0 dev-vcs/git
 SLOT=0
-SRC_URI=https://github.com/blogc/blogc-git-receiver/releases/download/v0.3.1/blogc-git-receiver-0.3.1.tar.xz
-_md5_=083a92d5b3cbc855955db44b8abcc9dd
+SRC_URI=https://github.com/blogc/blogc-git-receiver/releases/download/v0.4.0/blogc-git-receiver-0.4.0.tar.xz
+_md5_=94d594f1a14e1cd617c73c5b2f606af4
diff --git a/metadata/md5-cache/dev-vcs/blogc-git-receiver-9999 b/metadata/md5-cache/dev-vcs/blogc-git-receiver-9999
index 86e9a20c3ab7..8b4df23a9cf5 100644
--- a/metadata/md5-cache/dev-vcs/blogc-git-receiver-9999
+++ b/metadata/md5-cache/dev-vcs/blogc-git-receiver-9999
@@ -7,4 +7,4 @@ LICENSE=BSD
 RDEPEND==dev-libs/squareball-9999 dev-vcs/git
 SLOT=0
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	git-r3	ef66dfc3db09f327af21cf32f140fb2b	libtool	4890219c51da247200223277f993e054	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb
-_md5_=083a92d5b3cbc855955db44b8abcc9dd
+_md5_=94d594f1a14e1cd617c73c5b2f606af4
diff --git a/metadata/md5-cache/games-fps/quake2-demodata-3.14 b/metadata/md5-cache/games-fps/quake2-demodata-3.14
index fda3f6acb9b8..bce1ebe214ae 100644
--- a/metadata/md5-cache/games-fps/quake2-demodata-3.14
+++ b/metadata/md5-cache/games-fps/quake2-demodata-3.14
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=app-arch/unzip
+DEPEND=app-arch/unzip !games-fps/quake2-data
 DESCRIPTION=Demo data for Quake 2
 EAPI=5
 HOMEPAGE=http://en.wikipedia.org/wiki/Quake_II
@@ -10,4 +10,4 @@ RDEPEND=games-misc/games-envd
 SLOT=0
 SRC_URI=mirror://idsoftware/quake2/q2-314-demo-x86.exe
 _eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	9d81603248f2ba3ec59124320d123e5e	games	2cf0d67d765e6358b435ccda30c13ad8	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	unpacker	45d07319df5f40ee6af58418b0f930be	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=4664713ebcb014b0151a456f193eef40
+_md5_=9d247df9984283aed3a7a6a0a74ddea9
diff --git a/metadata/md5-cache/games-fps/qudos-0.40.1 b/metadata/md5-cache/games-fps/qudos-0.40.1
index d21c88d62f7f..ca0e17e0178f 100644
--- a/metadata/md5-cache/games-fps/qudos-0.40.1
+++ b/metadata/md5-cache/games-fps/qudos-0.40.1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=alsa? ( media-libs/alsa-lib ) opengl? ( virtual/opengl virtual/glu ) sdl? ( media-libs/libsdl ) virtual/jpeg:0 media-libs/libogg media-libs/libpng:0 media-libs/libvorbis sys-libs/zlib x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86dga x11-libs/libXxf86vm
+DEPEND=opengl? ( virtual/opengl virtual/glu ) sdl? ( media-libs/libsdl[joystick?,opengl,sound,video] virtual/opengl virtual/glu ) virtual/jpeg:0 media-libs/libogg media-libs/libpng:0 media-libs/libvorbis sys-libs/zlib x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86dga x11-libs/libXxf86vm
 DESCRIPTION=Enhanced Quake 2 engine
 EAPI=5
-HOMEPAGE=http://qudos.quakedev.com/
-IUSE=alsa cdinstall debug dedicated demo dga ipv6 joystick mods opengl qmax oss sdl textures
+HOMEPAGE=https://github.com/ZwS/qudos
+IUSE=cdinstall debug dedicated demo dga ipv6 joystick mods opengl qmax oss sdl textures
 KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=alsa? ( media-libs/alsa-lib ) opengl? ( virtual/opengl virtual/glu ) sdl? ( media-libs/libsdl ) virtual/jpeg:0 media-libs/libogg media-libs/libpng:0 media-libs/libvorbis sys-libs/zlib x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86dga x11-libs/libXxf86vm cdinstall? ( games-fps/quake2-data ) demo? ( games-fps/quake2-demodata ) textures? ( games-fps/quake2-textures ) games-misc/games-envd
+LICENSE=GPL-2+
+RDEPEND=opengl? ( virtual/opengl virtual/glu ) sdl? ( media-libs/libsdl[joystick?,opengl,sound,video] virtual/opengl virtual/glu ) virtual/jpeg:0 media-libs/libogg media-libs/libpng:0 media-libs/libvorbis sys-libs/zlib x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86dga x11-libs/libXxf86vm cdinstall? ( games-fps/quake2-data ) demo? ( games-fps/quake2-demodata[symlink] ) textures? ( games-fps/quake2-textures ) games-misc/games-envd
 SLOT=0
-SRC_URI=http://qudos.quakedev.com/linux/quake2/engines/QuDos/QuDos-0.40.1-src.tar.bz2 http://qudos.quakedev.com/linux/quake2/engines/QuDos/QuDos-0.40.1.pk3
+SRC_URI=mirror://gentoo/QuDos-0.40.1-src.tar.bz2 https://github.com/ZwS/qudos/raw/master/quake2/baseq2/qudos.pk3 -> QuDos-0.40.1.pk3
 _eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	9d81603248f2ba3ec59124320d123e5e	games	2cf0d67d765e6358b435ccda30c13ad8	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	user	906f3c8eb3a2350a4f1191a89baa3e46
-_md5_=b897b0ccdb64238e364107dc9446ae53
+_md5_=dff47579377cf87f06c5ef42696f98b7
diff --git a/metadata/md5-cache/gnome-base/gdm-3.16.4 b/metadata/md5-cache/gnome-base/gdm-3.16.4
deleted file mode 100644
index 9d1569e03bec..000000000000
--- a/metadata/md5-cache/gnome-base/gdm-3.16.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=app-text/iso-codes >=dev-libs/glib-2.36:2[dbus] >=x11-libs/gtk+-2.91.1:3 >=gnome-base/dconf-0.20 >=gnome-base/gnome-settings-daemon-3.1.4 gnome-base/gsettings-desktop-schemas >=media-libs/fontconfig-2.5.0 >=media-libs/libcanberra-0.4[gtk3] sys-apps/dbus >=sys-apps/accountsservice-0.6.12 x11-apps/sessreg x11-base/xorg-server x11-libs/libXi x11-libs/libXau x11-libs/libX11 x11-libs/libXdmcp x11-libs/libXext x11-libs/libXft >=x11-misc/xdg-utils-1.0.2-r3 virtual/pam systemd? ( >=sys-apps/systemd-186:0=[pam] ) !systemd? ( >=x11-base/xorg-server-1.14.3-r1 >=sys-auth/consolekit-0.4.5_p20120320-r2 !<sys-apps/openrc-0.12 ) sys-auth/pambase[systemd?] audit? ( sys-process/audit ) introspection? ( >=dev-libs/gobject-introspection-0.9.12:= ) plymouth? ( sys-boot/plymouth ) selinux? ( sys-libs/libselinux ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) xinerama? ( x11-libs/libXinerama ) app-text/docbook-xml-dtd:4.1.2 dev-util/gdbus-codegen >=dev-util/intltool-0.40.0 dev-util/itstool virtual/pkgconfig x11-proto/inputproto x11-proto/randrproto test? ( >=dev-libs/check-0.9.4 ) xinerama? ( x11-proto/xineramaproto ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info virtual/pkgconfig
-DESCRIPTION=GNOME Display Manager for managing graphical display servers and user logins
-EAPI=5
-HOMEPAGE=https://wiki.gnome.org/Projects/GDM
-IUSE=accessibility audit branding fprint +introspection ipv6 plymouth selinux smartcard +systemd tcpd test wayland xinerama debug
-KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86
-LICENSE=GPL-2+ branding? ( CC-Sampling-Plus-1.0 )
-RDEPEND=app-text/iso-codes >=dev-libs/glib-2.36:2[dbus] >=x11-libs/gtk+-2.91.1:3 >=gnome-base/dconf-0.20 >=gnome-base/gnome-settings-daemon-3.1.4 gnome-base/gsettings-desktop-schemas >=media-libs/fontconfig-2.5.0 >=media-libs/libcanberra-0.4[gtk3] sys-apps/dbus >=sys-apps/accountsservice-0.6.12 x11-apps/sessreg x11-base/xorg-server x11-libs/libXi x11-libs/libXau x11-libs/libX11 x11-libs/libXdmcp x11-libs/libXext x11-libs/libXft >=x11-misc/xdg-utils-1.0.2-r3 virtual/pam systemd? ( >=sys-apps/systemd-186:0=[pam] ) !systemd? ( >=x11-base/xorg-server-1.14.3-r1 >=sys-auth/consolekit-0.4.5_p20120320-r2 !<sys-apps/openrc-0.12 ) sys-auth/pambase[systemd?] audit? ( sys-process/audit ) introspection? ( >=dev-libs/gobject-introspection-0.9.12:= ) plymouth? ( sys-boot/plymouth ) selinux? ( sys-libs/libselinux ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) xinerama? ( x11-libs/libXinerama ) >=gnome-base/gnome-session-3.6 >=gnome-base/gnome-shell-3.1.90 gnome-extra/polkit-gnome:0 x11-apps/xhost x11-themes/gnome-icon-theme-symbolic accessibility? ( >=app-accessibility/orca-3.10 gnome-extra/mousetweaks ) fprint? ( sys-auth/fprintd sys-auth/pam_fprint ) !gnome-extra/fast-user-switch-applet
-REQUIRED_USE=wayland? ( systemd )
-SLOT=0
-SRC_URI=mirror://gnome/sources/gdm/3.16/gdm-3.16.4.tar.xz branding? ( http://www.mail-archive.com/tango-artists@lists.freedesktop.org/msg00043/tango-gentoo-v1.1.tar.gz )
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	21c81ea94c12e45a63f7f14fba666e3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multilib	23ae8c186171e6476af098d2a50d0ee0	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	readme.gentoo	df3fc8fdaf5a519e7d48c83e7592c95f	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=292c9c71ddea66b3b8a3bd3345a11c5b
diff --git a/metadata/md5-cache/gnome-base/gdm-3.18.3 b/metadata/md5-cache/gnome-base/gdm-3.18.3
new file mode 100644
index 000000000000..45e48690cd93
--- /dev/null
+++ b/metadata/md5-cache/gnome-base/gdm-3.18.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
+DEPEND=app-text/iso-codes >=dev-libs/glib-2.36:2[dbus] >=x11-libs/gtk+-2.91.1:3 >=gnome-base/dconf-0.20 >=gnome-base/gnome-settings-daemon-3.1.4 gnome-base/gsettings-desktop-schemas >=media-libs/fontconfig-2.5.0:1.0 >=media-libs/libcanberra-0.4[gtk3] sys-apps/dbus >=sys-apps/accountsservice-0.6.12 x11-apps/sessreg x11-base/xorg-server x11-libs/libXi x11-libs/libXau x11-libs/libX11 x11-libs/libXdmcp x11-libs/libXext x11-libs/libXft >=x11-misc/xdg-utils-1.0.2-r3 virtual/pam >=sys-apps/systemd-186:0=[pam] sys-auth/pambase[systemd] audit? ( sys-process/audit ) introspection? ( >=dev-libs/gobject-introspection-0.9.12:= ) plymouth? ( sys-boot/plymouth ) selinux? ( sys-libs/libselinux ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) xinerama? ( x11-libs/libXinerama ) app-text/docbook-xml-dtd:4.1.2 dev-util/gdbus-codegen >=dev-util/intltool-0.40.0 dev-util/itstool virtual/pkgconfig x11-proto/inputproto x11-proto/randrproto test? ( >=dev-libs/check-0.9.4 ) xinerama? ( x11-proto/xineramaproto ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info virtual/pkgconfig
+DESCRIPTION=GNOME Display Manager for managing graphical display servers and user logins
+EAPI=5
+HOMEPAGE=https://wiki.gnome.org/Projects/GDM
+IUSE=accessibility audit branding fprint +introspection ipv6 plymouth selinux smartcard tcpd test wayland xinerama debug
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86
+LICENSE=GPL-2+ branding? ( CC-Sampling-Plus-1.0 )
+RDEPEND=app-text/iso-codes >=dev-libs/glib-2.36:2[dbus] >=x11-libs/gtk+-2.91.1:3 >=gnome-base/dconf-0.20 >=gnome-base/gnome-settings-daemon-3.1.4 gnome-base/gsettings-desktop-schemas >=media-libs/fontconfig-2.5.0:1.0 >=media-libs/libcanberra-0.4[gtk3] sys-apps/dbus >=sys-apps/accountsservice-0.6.12 x11-apps/sessreg x11-base/xorg-server x11-libs/libXi x11-libs/libXau x11-libs/libX11 x11-libs/libXdmcp x11-libs/libXext x11-libs/libXft >=x11-misc/xdg-utils-1.0.2-r3 virtual/pam >=sys-apps/systemd-186:0=[pam] sys-auth/pambase[systemd] audit? ( sys-process/audit ) introspection? ( >=dev-libs/gobject-introspection-0.9.12:= ) plymouth? ( sys-boot/plymouth ) selinux? ( sys-libs/libselinux ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) xinerama? ( x11-libs/libXinerama ) >=gnome-base/gnome-session-3.6 >=gnome-base/gnome-shell-3.1.90 x11-apps/xhost accessibility? ( >=app-accessibility/orca-3.10 gnome-extra/mousetweaks ) fprint? ( sys-auth/fprintd sys-auth/pam_fprint ) !gnome-extra/fast-user-switch-applet
+SLOT=0
+SRC_URI=mirror://gnome/sources/gdm/3.18/gdm-3.18.3.tar.xz branding? ( http://www.mail-archive.com/tango-artists@lists.freedesktop.org/msg00043/tango-gentoo-v1.1.tar.gz )
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	21c81ea94c12e45a63f7f14fba666e3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multilib	23ae8c186171e6476af098d2a50d0ee0	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	readme.gentoo-r1	03878c06495db70bc36bd717383c09f7	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=8eae739c98333859eeb2fed24570116c
diff --git a/metadata/md5-cache/mail-mta/postfix-2.10.9 b/metadata/md5-cache/mail-mta/postfix-2.10.9
index 9fcabd75f210..39029dd60023 100644
--- a/metadata/md5-cache/mail-mta/postfix-2.10.9
+++ b/metadata/md5-cache/mail-mta/postfix-2.10.9
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst preinst prepare setup
-DEPEND=>=dev-libs/libpcre-3.4 dev-lang/perl berkdb? ( >=sys-libs/db-3.2:* ) cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r1 ) ) ldap? ( net-nds/openldap ) ldap-bind? ( net-nds/openldap[sasl] ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:* ) sasl? ( >=dev-libs/cyrus-sasl-2 ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl:0 ) ssl? ( dev-libs/openssl:0= ) virtual/pkgconfig
+DEPEND=>=dev-libs/libpcre-3.4 dev-lang/perl berkdb? ( >=sys-libs/db-3.2:* ) cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r1 ) ) ldap? ( net-nds/openldap ) ldap-bind? ( net-nds/openldap[sasl] ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:* ) sasl? ( >=dev-libs/cyrus-sasl-2 ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl:0 ) ssl? ( dev-libs/openssl:0 ) virtual/pkgconfig
 DESCRIPTION=A fast and secure drop-in replacement for sendmail
 EAPI=5
 HOMEPAGE=http://www.postfix.org/
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/libpcre-3.4 dev-lang/perl berkdb? ( >=sys-libs/db-3.2:* ) cdb
 REQUIRED_USE=ldap-bind? ( ldap sasl )
 SLOT=0
 SRC_URI=ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-2.10.9.tar.gz vda? ( http://vda.sourceforge.net/VDA/postfix-vda-v13-2.10.0.patch )
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	23ae8c186171e6476af098d2a50d0ee0	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	ssl-cert	b29ef3f715f3a76f1bf807b7e8751096	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	23ae8c186171e6476af098d2a50d0ee0	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	ssl-cert	6f7d720c036362122b0bfb4461e56a11	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3a4b770f6593bf9eeab9388013fa3f69
diff --git a/metadata/md5-cache/mail-mta/postfix-2.11.7 b/metadata/md5-cache/mail-mta/postfix-2.11.7
index 06bfc118d2ab..6f839bb01997 100644
--- a/metadata/md5-cache/mail-mta/postfix-2.11.7
+++ b/metadata/md5-cache/mail-mta/postfix-2.11.7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst preinst prepare setup
-DEPEND=>=dev-libs/libpcre-3.4 dev-lang/perl berkdb? ( >=sys-libs/db-3.2:* ) cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r1 ) ) ldap? ( net-nds/openldap ) ldap-bind? ( net-nds/openldap[sasl] ) lmdb? ( >=dev-db/lmdb-0.9.11 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:* ) sasl? ( >=dev-libs/cyrus-sasl-2 ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl:0 ) ssl? ( dev-libs/openssl:0= ) virtual/pkgconfig
+DEPEND=>=dev-libs/libpcre-3.4 dev-lang/perl berkdb? ( >=sys-libs/db-3.2:* ) cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r1 ) ) ldap? ( net-nds/openldap ) ldap-bind? ( net-nds/openldap[sasl] ) lmdb? ( >=dev-db/lmdb-0.9.11 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:* ) sasl? ( >=dev-libs/cyrus-sasl-2 ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl:0 ) ssl? ( dev-libs/openssl:0 ) virtual/pkgconfig
 DESCRIPTION=A fast and secure drop-in replacement for sendmail
 EAPI=5
 HOMEPAGE=http://www.postfix.org/
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/libpcre-3.4 dev-lang/perl berkdb? ( >=sys-libs/db-3.2:* ) cdb
 REQUIRED_USE=ldap-bind? ( ldap sasl )
 SLOT=0
 SRC_URI=ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-2.11.7.tar.gz vda? ( http://vda.sourceforge.net/VDA/postfix-vda-v13-2.10.0.patch )
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	23ae8c186171e6476af098d2a50d0ee0	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	ssl-cert	b29ef3f715f3a76f1bf807b7e8751096	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	23ae8c186171e6476af098d2a50d0ee0	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	ssl-cert	6f7d720c036362122b0bfb4461e56a11	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6733536c9360a95567326bb31824da73
diff --git a/metadata/md5-cache/mail-mta/postfix-3.0.2 b/metadata/md5-cache/mail-mta/postfix-3.0.2
index 8fe1020f94e2..38238611a917 100644
--- a/metadata/md5-cache/mail-mta/postfix-3.0.2
+++ b/metadata/md5-cache/mail-mta/postfix-3.0.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=>=dev-libs/libpcre-3.4 dev-lang/perl berkdb? ( >=sys-libs/db-3.2:* ) cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r1 ) ) eai? ( dev-libs/icu:= ) ldap? ( net-nds/openldap ) ldap-bind? ( net-nds/openldap[sasl] ) lmdb? ( >=dev-db/lmdb-0.9.11 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:* ) sasl? ( >=dev-libs/cyrus-sasl-2 ) sqlite? ( dev-db/sqlite:3 ) ssl? ( >=dev-libs/openssl-0.9.6g:* ) ssl? ( dev-libs/openssl:0= ) virtual/pkgconfig
+DEPEND=>=dev-libs/libpcre-3.4 dev-lang/perl berkdb? ( >=sys-libs/db-3.2:* ) cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r1 ) ) eai? ( dev-libs/icu:= ) ldap? ( net-nds/openldap ) ldap-bind? ( net-nds/openldap[sasl] ) lmdb? ( >=dev-db/lmdb-0.9.11 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:* ) sasl? ( >=dev-libs/cyrus-sasl-2 ) sqlite? ( dev-db/sqlite:3 ) ssl? ( >=dev-libs/openssl-0.9.6g:* ) ssl? ( dev-libs/openssl:0 ) virtual/pkgconfig
 DESCRIPTION=A fast and secure drop-in replacement for sendmail
 EAPI=5
 HOMEPAGE=http://www.postfix.org/
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/libpcre-3.4 dev-lang/perl berkdb? ( >=sys-libs/db-3.2:* ) cdb
 REQUIRED_USE=ldap-bind? ( ldap sasl ) !vda
 SLOT=0
 SRC_URI=ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-3.0.2.tar.gz vda? ( http://vda.sourceforge.net/VDA/postfix-vda-v13-2.10.0.patch )
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	23ae8c186171e6476af098d2a50d0ee0	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	ssl-cert	b29ef3f715f3a76f1bf807b7e8751096	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	23ae8c186171e6476af098d2a50d0ee0	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	ssl-cert	6f7d720c036362122b0bfb4461e56a11	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=eeacbc812bd9a5c626dc2ca03f24f437
diff --git a/metadata/md5-cache/mail-mta/postfix-3.0.2-r1 b/metadata/md5-cache/mail-mta/postfix-3.0.2-r1
index 65a3bdf53709..79bddb42501f 100644
--- a/metadata/md5-cache/mail-mta/postfix-3.0.2-r1
+++ b/metadata/md5-cache/mail-mta/postfix-3.0.2-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=>=dev-libs/libpcre-3.4 dev-lang/perl berkdb? ( >=sys-libs/db-3.2:* ) cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r1 ) ) eai? ( dev-libs/icu:= ) ldap? ( net-nds/openldap ) ldap-bind? ( net-nds/openldap[sasl] ) lmdb? ( >=dev-db/lmdb-0.9.11 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:* ) sasl? ( >=dev-libs/cyrus-sasl-2 ) sqlite? ( dev-db/sqlite:3 ) ssl? ( >=dev-libs/openssl-0.9.6g:* ) ssl? ( dev-libs/openssl:0= ) virtual/pkgconfig
+DEPEND=>=dev-libs/libpcre-3.4 dev-lang/perl berkdb? ( >=sys-libs/db-3.2:* ) cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r1 ) ) eai? ( dev-libs/icu:= ) ldap? ( net-nds/openldap ) ldap-bind? ( net-nds/openldap[sasl] ) lmdb? ( >=dev-db/lmdb-0.9.11 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:* ) sasl? ( >=dev-libs/cyrus-sasl-2 ) sqlite? ( dev-db/sqlite:3 ) ssl? ( >=dev-libs/openssl-0.9.6g:* ) ssl? ( dev-libs/openssl:0 ) virtual/pkgconfig
 DESCRIPTION=A fast and secure drop-in replacement for sendmail
 EAPI=5
 HOMEPAGE=http://www.postfix.org/
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/libpcre-3.4 dev-lang/perl berkdb? ( >=sys-libs/db-3.2:* ) cdb
 REQUIRED_USE=ldap-bind? ( ldap sasl ) !vda
 SLOT=0
 SRC_URI=ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-3.0.2.tar.gz vda? ( http://vda.sourceforge.net/VDA/postfix-vda-v13-2.10.0.patch )
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	23ae8c186171e6476af098d2a50d0ee0	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	ssl-cert	b29ef3f715f3a76f1bf807b7e8751096	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	23ae8c186171e6476af098d2a50d0ee0	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	ssl-cert	6f7d720c036362122b0bfb4461e56a11	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3f6aabbea9f794123c7253ed9aeb67fd
diff --git a/metadata/md5-cache/mail-mta/postfix-3.0.2-r2 b/metadata/md5-cache/mail-mta/postfix-3.0.2-r2
index e94529d3ebde..7d72c7b1187f 100644
--- a/metadata/md5-cache/mail-mta/postfix-3.0.2-r2
+++ b/metadata/md5-cache/mail-mta/postfix-3.0.2-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=>=dev-libs/libpcre-3.4 dev-lang/perl berkdb? ( >=sys-libs/db-3.2:* ) cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r1 ) ) eai? ( dev-libs/icu:= ) ldap? ( net-nds/openldap ) ldap-bind? ( net-nds/openldap[sasl] ) lmdb? ( >=dev-db/lmdb-0.9.11 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:* ) sasl? ( >=dev-libs/cyrus-sasl-2 ) sqlite? ( dev-db/sqlite:3 ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6g:0 ) libressl? ( dev-libs/libressl ) ) ssl? ( dev-libs/openssl:0= ) virtual/pkgconfig
+DEPEND=>=dev-libs/libpcre-3.4 dev-lang/perl berkdb? ( >=sys-libs/db-3.2:* ) cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r1 ) ) eai? ( dev-libs/icu:= ) ldap? ( net-nds/openldap ) ldap-bind? ( net-nds/openldap[sasl] ) lmdb? ( >=dev-db/lmdb-0.9.11 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:* ) sasl? ( >=dev-libs/cyrus-sasl-2 ) sqlite? ( dev-db/sqlite:3 ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6g:0 ) libressl? ( dev-libs/libressl ) ) ssl? ( dev-libs/openssl:0 ) virtual/pkgconfig
 DESCRIPTION=A fast and secure drop-in replacement for sendmail
 EAPI=5
 HOMEPAGE=http://www.postfix.org/
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/libpcre-3.4 dev-lang/perl berkdb? ( >=sys-libs/db-3.2:* ) cdb
 REQUIRED_USE=ldap-bind? ( ldap sasl ) !vda
 SLOT=0
 SRC_URI=ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-3.0.2.tar.gz vda? ( http://vda.sourceforge.net/VDA/postfix-vda-v13-2.10.0.patch )
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	23ae8c186171e6476af098d2a50d0ee0	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	ssl-cert	b29ef3f715f3a76f1bf807b7e8751096	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	23ae8c186171e6476af098d2a50d0ee0	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	ssl-cert	6f7d720c036362122b0bfb4461e56a11	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=287587c0f280e7ad5be8e74a68bc689f
diff --git a/metadata/md5-cache/mail-mta/postfix-3.0.3 b/metadata/md5-cache/mail-mta/postfix-3.0.3
index 86c7951f70a3..c923064f5551 100644
--- a/metadata/md5-cache/mail-mta/postfix-3.0.3
+++ b/metadata/md5-cache/mail-mta/postfix-3.0.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=>=dev-libs/libpcre-3.4 dev-lang/perl berkdb? ( >=sys-libs/db-3.2:* ) cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r1 ) ) eai? ( dev-libs/icu:= ) ldap? ( net-nds/openldap ) ldap-bind? ( net-nds/openldap[sasl] ) lmdb? ( >=dev-db/lmdb-0.9.11 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:* ) sasl? ( >=dev-libs/cyrus-sasl-2 ) sqlite? ( dev-db/sqlite:3 ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) ssl? ( dev-libs/openssl:0= ) virtual/pkgconfig
+DEPEND=>=dev-libs/libpcre-3.4 dev-lang/perl berkdb? ( >=sys-libs/db-3.2:* ) cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r1 ) ) eai? ( dev-libs/icu:= ) ldap? ( net-nds/openldap ) ldap-bind? ( net-nds/openldap[sasl] ) lmdb? ( >=dev-db/lmdb-0.9.11 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:* ) sasl? ( >=dev-libs/cyrus-sasl-2 ) sqlite? ( dev-db/sqlite:3 ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) ssl? ( dev-libs/openssl:0 ) virtual/pkgconfig
 DESCRIPTION=A fast and secure drop-in replacement for sendmail
 EAPI=5
 HOMEPAGE=http://www.postfix.org/
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/libpcre-3.4 dev-lang/perl berkdb? ( >=sys-libs/db-3.2:* ) cdb
 REQUIRED_USE=ldap-bind? ( ldap sasl ) !vda
 SLOT=0
 SRC_URI=ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-3.0.3.tar.gz vda? ( http://vda.sourceforge.net/VDA/postfix-vda-v13-2.10.0.patch )
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	23ae8c186171e6476af098d2a50d0ee0	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	ssl-cert	b29ef3f715f3a76f1bf807b7e8751096	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	23ae8c186171e6476af098d2a50d0ee0	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	ssl-cert	6f7d720c036362122b0bfb4461e56a11	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=16bebc7f9a5ff7891aa974f5053806f0
diff --git a/metadata/md5-cache/mail-mta/postfix-3.0.3-r1 b/metadata/md5-cache/mail-mta/postfix-3.0.3-r1
index 59ba5eaec24c..fc870e6c5402 100644
--- a/metadata/md5-cache/mail-mta/postfix-3.0.3-r1
+++ b/metadata/md5-cache/mail-mta/postfix-3.0.3-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=>=dev-libs/libpcre-3.4 dev-lang/perl berkdb? ( >=sys-libs/db-3.2:* ) cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r4 ) ) eai? ( dev-libs/icu:= ) ldap? ( net-nds/openldap ) ldap-bind? ( net-nds/openldap[sasl] ) lmdb? ( >=dev-db/lmdb-0.9.11 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:* ) sasl? ( >=dev-libs/cyrus-sasl-2 ) sqlite? ( dev-db/sqlite:3 ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) ssl? ( dev-libs/openssl:0= ) virtual/pkgconfig
+DEPEND=>=dev-libs/libpcre-3.4 dev-lang/perl berkdb? ( >=sys-libs/db-3.2:* ) cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r4 ) ) eai? ( dev-libs/icu:= ) ldap? ( net-nds/openldap ) ldap-bind? ( net-nds/openldap[sasl] ) lmdb? ( >=dev-db/lmdb-0.9.11 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:* ) sasl? ( >=dev-libs/cyrus-sasl-2 ) sqlite? ( dev-db/sqlite:3 ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) ssl? ( dev-libs/openssl:0 ) virtual/pkgconfig
 DESCRIPTION=A fast and secure drop-in replacement for sendmail
 EAPI=5
 HOMEPAGE=http://www.postfix.org/
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/libpcre-3.4 dev-lang/perl berkdb? ( >=sys-libs/db-3.2:* ) cdb
 REQUIRED_USE=ldap-bind? ( ldap sasl ) !vda
 SLOT=0
 SRC_URI=ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-3.0.3.tar.gz vda? ( http://vda.sourceforge.net/VDA/postfix-vda-v13-2.10.0.patch )
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	23ae8c186171e6476af098d2a50d0ee0	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	ssl-cert	b29ef3f715f3a76f1bf807b7e8751096	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	23ae8c186171e6476af098d2a50d0ee0	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	ssl-cert	6f7d720c036362122b0bfb4461e56a11	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=13be8a2b7f690455dd04e4033b932025
diff --git a/metadata/md5-cache/mail-mta/postfix-3.0.4 b/metadata/md5-cache/mail-mta/postfix-3.0.4
index 26c32a451e5b..fe3f093d8727 100644
--- a/metadata/md5-cache/mail-mta/postfix-3.0.4
+++ b/metadata/md5-cache/mail-mta/postfix-3.0.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=>=dev-libs/libpcre-3.4 dev-lang/perl berkdb? ( >=sys-libs/db-3.2:* ) cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r4 ) ) eai? ( dev-libs/icu:= ) ldap? ( net-nds/openldap ) ldap-bind? ( net-nds/openldap[sasl] ) lmdb? ( >=dev-db/lmdb-0.9.11 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:* ) sasl? ( >=dev-libs/cyrus-sasl-2 ) sqlite? ( dev-db/sqlite:3 ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) ssl? ( dev-libs/openssl:0= ) virtual/pkgconfig
+DEPEND=>=dev-libs/libpcre-3.4 dev-lang/perl berkdb? ( >=sys-libs/db-3.2:* ) cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r4 ) ) eai? ( dev-libs/icu:= ) ldap? ( net-nds/openldap ) ldap-bind? ( net-nds/openldap[sasl] ) lmdb? ( >=dev-db/lmdb-0.9.11 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:* ) sasl? ( >=dev-libs/cyrus-sasl-2 ) sqlite? ( dev-db/sqlite:3 ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) ssl? ( dev-libs/openssl:0 ) virtual/pkgconfig
 DESCRIPTION=A fast and secure drop-in replacement for sendmail
 EAPI=5
 HOMEPAGE=http://www.postfix.org/
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/libpcre-3.4 dev-lang/perl berkdb? ( >=sys-libs/db-3.2:* ) cdb
 REQUIRED_USE=ldap-bind? ( ldap sasl ) !vda
 SLOT=0
 SRC_URI=ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-3.0.4.tar.gz vda? ( http://vda.sourceforge.net/VDA/postfix-vda-v13-2.10.0.patch )
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	23ae8c186171e6476af098d2a50d0ee0	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	ssl-cert	b29ef3f715f3a76f1bf807b7e8751096	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	23ae8c186171e6476af098d2a50d0ee0	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	ssl-cert	6f7d720c036362122b0bfb4461e56a11	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=115549b12ba58c1ad74b8da10eec4434
diff --git a/metadata/md5-cache/media-gfx/gthumb-3.4.3 b/metadata/md5-cache/media-gfx/gthumb-3.4.3
new file mode 100644
index 000000000000..0b00b63ae750
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/gthumb-3.4.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
+DEPEND=>=dev-libs/glib-2.36.0:2[dbus] >=x11-libs/gtk+-3.10.0:3 media-libs/libpng:0= sys-libs/zlib x11-libs/libICE x11-libs/libSM cdr? ( >=app-cdr/brasero-3.2 ) exif? ( >=media-gfx/exiv2-0.21:= ) gnome-keyring? ( >=app-crypt/libsecret-0.11 ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) http? ( >=net-libs/libsoup-2.42.0:2.4 ) jpeg? ( virtual/jpeg:0= ) json? ( >=dev-libs/json-glib-0.15.0 ) lcms? ( >=media-libs/lcms-2.6:2 ) slideshow? ( >=media-libs/clutter-1.12.0:1.0 >=media-libs/clutter-gtk-1:1.0 ) svg? ( >=gnome-base/librsvg-2.34 ) tiff? ( media-libs/tiff:= ) raw? ( >=media-libs/libraw-0.14:= ) !raw? ( media-gfx/dcraw ) webkit? ( net-libs/webkit-gtk:4 ) webp? ( >=media-libs/libwebp-0.2.0 ) app-text/yelp-tools >=dev-util/intltool-0.35 sys-devel/bison sys-devel/flex virtual/pkgconfig test? ( ~app-text/docbook-xml-dtd-4.1.2 ) app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Image viewer and browser for Gnome
+EAPI=5
+HOMEPAGE=https://wiki.gnome.org/Apps/gthumb
+IUSE=cdr exif gnome-keyring gstreamer http jpeg json lcms raw slideshow svg tiff test webkit webp debug
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=GPL-2+
+RDEPEND=>=dev-libs/glib-2.36.0:2[dbus] >=x11-libs/gtk+-3.10.0:3 media-libs/libpng:0= sys-libs/zlib x11-libs/libICE x11-libs/libSM cdr? ( >=app-cdr/brasero-3.2 ) exif? ( >=media-gfx/exiv2-0.21:= ) gnome-keyring? ( >=app-crypt/libsecret-0.11 ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) http? ( >=net-libs/libsoup-2.42.0:2.4 ) jpeg? ( virtual/jpeg:0= ) json? ( >=dev-libs/json-glib-0.15.0 ) lcms? ( >=media-libs/lcms-2.6:2 ) slideshow? ( >=media-libs/clutter-1.12.0:1.0 >=media-libs/clutter-gtk-1:1.0 ) svg? ( >=gnome-base/librsvg-2.34 ) tiff? ( media-libs/tiff:= ) raw? ( >=media-libs/libraw-0.14:= ) !raw? ( media-gfx/dcraw ) webkit? ( net-libs/webkit-gtk:4 ) webp? ( >=media-libs/libwebp-0.2.0 ) >=gnome-base/gsettings-desktop-schemas-0.1.4
+SLOT=0
+SRC_URI=mirror://gnome/sources/gthumb/3.4/gthumb-3.4.3.tar.xz
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	21c81ea94c12e45a63f7f14fba666e3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=b69700c6cb9b701934da85025359c330
diff --git a/metadata/md5-cache/media-plugins/vdr-live-0.3.0_p20130504-r1 b/metadata/md5-cache/media-plugins/vdr-live-0.3.0_p20130504-r1
index 3dab16552990..5a03606e58e6 100644
--- a/metadata/md5-cache/media-plugins/vdr-live-0.3.0_p20130504-r1
+++ b/metadata/md5-cache/media-plugins/vdr-live-0.3.0_p20130504-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile config configure install postinst postrm prepare setup unpack
-DEPEND=media-video/vdr >=dev-libs/tntnet-2.2.1[ssl=] >=dev-libs/cxxtools-2.2.1 pcre? ( >=dev-libs/libpcre-8.12[cxx] ) >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers ssl? ( dev-libs/openssl:0= )
+DEPEND=media-video/vdr >=dev-libs/tntnet-2.2.1[ssl=] >=dev-libs/cxxtools-2.2.1 pcre? ( >=dev-libs/libpcre-8.12[cxx] ) >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers ssl? ( dev-libs/openssl:0 )
 DESCRIPTION=VDR Plugin: Web Access To Settings
 EAPI=5
 HOMEPAGE=http://live.vdr-developer.org
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-video/vdr >=dev-libs/tntnet-2.2.1[ssl=] >=dev-libs/cxxtools-2.2.1 pcre? ( >=dev-libs/libpcre-8.12[cxx] ) >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://gentoo/vdr-live-0.3.0_p20130504.tar.bz2 https://dev.gentoo.org/~hd_brummy/distfiles/vdr-live-0.3.0_p20130504.tar.bz2
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	23ae8c186171e6476af098d2a50d0ee0	ssl-cert	b29ef3f715f3a76f1bf807b7e8751096	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	unpacker	45d07319df5f40ee6af58418b0f930be	vdr-plugin-2	10cd413f0e936b01e977002c4c9409c9
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	23ae8c186171e6476af098d2a50d0ee0	ssl-cert	6f7d720c036362122b0bfb4461e56a11	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	unpacker	45d07319df5f40ee6af58418b0f930be	vdr-plugin-2	10cd413f0e936b01e977002c4c9409c9
 _md5_=56cc9e6f088a82072e4d71af63c2ceb7
diff --git a/metadata/md5-cache/media-plugins/vdr-live-0.3.0_p20130504-r2 b/metadata/md5-cache/media-plugins/vdr-live-0.3.0_p20130504-r2
index 5f1965a78e64..e9edaf2ddbd9 100644
--- a/metadata/md5-cache/media-plugins/vdr-live-0.3.0_p20130504-r2
+++ b/metadata/md5-cache/media-plugins/vdr-live-0.3.0_p20130504-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile config configure install postinst postrm prepare setup unpack
-DEPEND=media-video/vdr >=dev-libs/tntnet-2.2.1[ssl=] >=dev-libs/cxxtools-2.2.1 pcre? ( >=dev-libs/libpcre-8.12[cxx] ) >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers ssl? ( dev-libs/openssl:0= )
+DEPEND=media-video/vdr >=dev-libs/tntnet-2.2.1[ssl=] >=dev-libs/cxxtools-2.2.1 pcre? ( >=dev-libs/libpcre-8.12[cxx] ) >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers ssl? ( dev-libs/openssl:0 )
 DESCRIPTION=VDR Plugin: Web Access To Settings
 EAPI=5
 HOMEPAGE=http://live.vdr-developer.org
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-video/vdr >=dev-libs/tntnet-2.2.1[ssl=] >=dev-libs/cxxtools-2.2.1 pcre? ( >=dev-libs/libpcre-8.12[cxx] ) >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://gentoo/vdr-live-0.3.0_p20130504.tar.bz2 https://dev.gentoo.org/~hd_brummy/distfiles/vdr-live-0.3.0_p20130504.tar.bz2
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	23ae8c186171e6476af098d2a50d0ee0	ssl-cert	b29ef3f715f3a76f1bf807b7e8751096	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	unpacker	45d07319df5f40ee6af58418b0f930be	vdr-plugin-2	10cd413f0e936b01e977002c4c9409c9
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	23ae8c186171e6476af098d2a50d0ee0	ssl-cert	6f7d720c036362122b0bfb4461e56a11	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	unpacker	45d07319df5f40ee6af58418b0f930be	vdr-plugin-2	10cd413f0e936b01e977002c4c9409c9
 _md5_=19bf88a606970063593576315125c568
diff --git a/metadata/md5-cache/media-plugins/vdr-vdrmanager-0.12 b/metadata/md5-cache/media-plugins/vdr-vdrmanager-0.12
index 94cb10db8afb..224fc767fb6f 100644
--- a/metadata/md5-cache/media-plugins/vdr-vdrmanager-0.12
+++ b/metadata/md5-cache/media-plugins/vdr-vdrmanager-0.12
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-2 ssl? ( dev-libs/openssl ) >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers ssl? ( dev-libs/openssl:0= )
+DEPEND=>=media-video/vdr-2 ssl? ( dev-libs/openssl ) >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers ssl? ( dev-libs/openssl:0 )
 DESCRIPTION=VDR Plugin: allows remote programming VDR using VDR-Manager running on Android devices
 EAPI=5
 HOMEPAGE=http://projects.vdr-developer.org/projects/vdr-manager/wiki
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=stream? ( media-plugins/vdr-streamdev[server] ) zlib? ( sys-libs/zlib ) >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/1747/vdr-vdrmanager-0.12.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	23ae8c186171e6476af098d2a50d0ee0	ssl-cert	b29ef3f715f3a76f1bf807b7e8751096	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	unpacker	45d07319df5f40ee6af58418b0f930be	vdr-plugin-2	10cd413f0e936b01e977002c4c9409c9
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	23ae8c186171e6476af098d2a50d0ee0	ssl-cert	6f7d720c036362122b0bfb4461e56a11	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	unpacker	45d07319df5f40ee6af58418b0f930be	vdr-plugin-2	10cd413f0e936b01e977002c4c9409c9
 _md5_=f659fd5657941d94f148ccf516785059
diff --git a/metadata/md5-cache/media-sound/clementine-1.3_rc1 b/metadata/md5-cache/media-sound/clementine-1.3
similarity index 77%
rename from metadata/md5-cache/media-sound/clementine-1.3_rc1
rename to metadata/md5-cache/media-sound/clementine-1.3
index 0eef39548e30..af4a50a91611 100644
--- a/metadata/md5-cache/media-sound/clementine-1.3_rc1
+++ b/metadata/md5-cache/media-sound/clementine-1.3
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=dev-db/sqlite:= >=dev-libs/glib-2.24.1-r1 dev-libs/libxml2 dev-libs/protobuf:= dev-libs/qjson >=dev-qt/qtcore-4.5:4 >=dev-qt/qtgui-4.5:4 >=dev-qt/qtopengl-4.5:4 >=dev-qt/qtsql-4.5:4[sqlite] >=media-libs/chromaprint-0.6 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-libs/libechonest:=[qt4] >=media-libs/libmygpo-qt-1.0.8 >=media-libs/taglib-1.8[mp4] sys-libs/zlib virtual/glu virtual/opengl x11-libs/libX11 cdda? ( dev-libs/libcdio ) dbus? ( >=dev-qt/qtdbus-4.5:4 ) ipod? ( >=media-libs/libgpod-0.8.0 ) lastfm? ( >=media-libs/liblastfm-1[qt4(+)] ) mtp? ( >=media-libs/libmtp-1.0.0 ) moodbar? ( sci-libs/fftw:3.0 ) projectm? ( media-libs/glew:= ) >=dev-libs/boost-1.39 virtual/pkgconfig sys-devel/gettext dev-qt/qttest:4 dev-cpp/gmock box? ( dev-cpp/sparsehash ) dropbox? ( dev-cpp/sparsehash ) googledrive? ( dev-cpp/sparsehash ) skydrive? ( dev-cpp/sparsehash ) ubuntu-one? ( dev-cpp/sparsehash ) test? ( gnome-base/gsettings-desktop-schemas ) sys-devel/make >=dev-util/cmake-2.8.12 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=dev-db/sqlite:= >=dev-libs/glib-2.24.1-r1 dev-libs/libxml2 dev-libs/protobuf:= dev-libs/qjson >=dev-qt/qtcore-4.5:4 >=dev-qt/qtgui-4.5:4 >=dev-qt/qtopengl-4.5:4 >=dev-qt/qtsql-4.5:4[sqlite] >=media-libs/chromaprint-0.6 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-libs/libechonest:=[qt4] >=media-libs/libmygpo-qt-1.0.8 >=media-libs/taglib-1.8[mp4] sys-libs/zlib virtual/glu virtual/opengl x11-libs/libX11 cdda? ( dev-libs/libcdio ) dbus? ( >=dev-qt/qtdbus-4.5:4 ) ipod? ( >=media-libs/libgpod-0.8.0 ) lastfm? ( >=media-libs/liblastfm-1[qt4(+)] ) mtp? ( >=media-libs/libmtp-1.0.0 ) moodbar? ( sci-libs/fftw:3.0 ) projectm? ( media-libs/glew:= ) >=dev-libs/crypto++-5.6.2-r4 >=dev-libs/boost-1.39 virtual/pkgconfig sys-devel/gettext dev-qt/qttest:4 dev-cpp/gmock box? ( dev-cpp/sparsehash ) dropbox? ( dev-cpp/sparsehash ) googledrive? ( dev-cpp/sparsehash ) skydrive? ( dev-cpp/sparsehash ) ubuntu-one? ( dev-cpp/sparsehash ) test? ( gnome-base/gsettings-desktop-schemas ) sys-devel/make >=dev-util/cmake-2.8.12 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=A modern music player and library organizer based on Amarok 1.4 and Qt4
 EAPI=5
 HOMEPAGE=http://www.clementine-player.org https://github.com/clementine-player/Clementine
 IUSE=box cdda +dbus debug dropbox googledrive ipod lastfm mms moodbar mtp projectm skydrive test ubuntu-one +udisks wiimote linguas_af linguas_ar linguas_be linguas_bg linguas_bn linguas_br linguas_bs linguas_ca linguas_cs linguas_cy linguas_da linguas_de linguas_el linguas_en_CA linguas_en_GB linguas_eo linguas_es linguas_et linguas_eu linguas_fa linguas_fi linguas_fr linguas_ga linguas_gl linguas_he linguas_he_IL linguas_hi linguas_hr linguas_hu linguas_hy linguas_ia linguas_id linguas_is linguas_it linguas_ja linguas_ka linguas_kk linguas_ko linguas_lt linguas_lv linguas_mr linguas_ms linguas_my linguas_nb linguas_nl linguas_oc linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_si_LK linguas_sk linguas_sl linguas_sr linguas_sr@latin linguas_sv linguas_te linguas_tr linguas_tr_TR linguas_uk linguas_uz linguas_vi linguas_zh_CN linguas_zh_TW test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
-RDEPEND=dev-db/sqlite:= >=dev-libs/glib-2.24.1-r1 dev-libs/libxml2 dev-libs/protobuf:= dev-libs/qjson >=dev-qt/qtcore-4.5:4 >=dev-qt/qtgui-4.5:4 >=dev-qt/qtopengl-4.5:4 >=dev-qt/qtsql-4.5:4[sqlite] >=media-libs/chromaprint-0.6 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-libs/libechonest:=[qt4] >=media-libs/libmygpo-qt-1.0.8 >=media-libs/taglib-1.8[mp4] sys-libs/zlib virtual/glu virtual/opengl x11-libs/libX11 cdda? ( dev-libs/libcdio ) dbus? ( >=dev-qt/qtdbus-4.5:4 ) ipod? ( >=media-libs/libgpod-0.8.0 ) lastfm? ( >=media-libs/liblastfm-1[qt4(+)] ) mtp? ( >=media-libs/libmtp-1.0.0 ) moodbar? ( sci-libs/fftw:3.0 ) projectm? ( media-libs/glew:= ) dbus? ( udisks? ( sys-fs/udisks:2 ) ) mms? ( media-plugins/gst-plugins-libmms:1.0 ) mtp? ( gnome-base/gvfs ) projectm? ( >=media-libs/libprojectm-1.2.0 ) media-plugins/gst-plugins-meta:1.0 media-plugins/gst-plugins-soup:1.0 media-plugins/gst-plugins-taglib:1.0
+RDEPEND=dev-db/sqlite:= >=dev-libs/glib-2.24.1-r1 dev-libs/libxml2 dev-libs/protobuf:= dev-libs/qjson >=dev-qt/qtcore-4.5:4 >=dev-qt/qtgui-4.5:4 >=dev-qt/qtopengl-4.5:4 >=dev-qt/qtsql-4.5:4[sqlite] >=media-libs/chromaprint-0.6 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-libs/libechonest:=[qt4] >=media-libs/libmygpo-qt-1.0.8 >=media-libs/taglib-1.8[mp4] sys-libs/zlib virtual/glu virtual/opengl x11-libs/libX11 cdda? ( dev-libs/libcdio ) dbus? ( >=dev-qt/qtdbus-4.5:4 ) ipod? ( >=media-libs/libgpod-0.8.0 ) lastfm? ( >=media-libs/liblastfm-1[qt4(+)] ) mtp? ( >=media-libs/libmtp-1.0.0 ) moodbar? ( sci-libs/fftw:3.0 ) projectm? ( media-libs/glew:= ) >=dev-libs/crypto++-5.6.2-r4 dbus? ( udisks? ( sys-fs/udisks:2 ) ) mms? ( media-plugins/gst-plugins-libmms:1.0 ) mtp? ( gnome-base/gvfs ) projectm? ( >=media-libs/libprojectm-1.2.0 ) media-plugins/gst-plugins-meta:1.0 media-plugins/gst-plugins-soup:1.0 media-plugins/gst-plugins-taglib:1.0
 REQUIRED_USE=udisks? ( dbus ) wiimote? ( dbus )
 RESTRICT=test
 SLOT=0
-SRC_URI=https://github.com/clementine-player/Clementine/archive/1.3rc1.tar.gz -> clementine-1.3_rc1.tar.gz
+SRC_URI=https://github.com/clementine-player/Clementine/archive/1.3.tar.gz -> clementine-1.3.tar.gz
 _eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	9d81603248f2ba3ec59124320d123e5e	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=1b07a395919a6bbd5f3e105e2cd61f85
+_md5_=60a5366ab8a5beea8bdb1c67e4f56e04
diff --git a/metadata/md5-cache/media-sound/clementine-1.3_rc1-r1 b/metadata/md5-cache/media-sound/clementine-1.3_rc1-r1
deleted file mode 100644
index 45aaa0d27835..000000000000
--- a/metadata/md5-cache/media-sound/clementine-1.3_rc1-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=dev-db/sqlite:= >=dev-libs/glib-2.24.1-r1 dev-libs/libxml2 dev-libs/protobuf:= dev-libs/qjson >=dev-qt/qtcore-4.5:4 >=dev-qt/qtgui-4.5:4 >=dev-qt/qtopengl-4.5:4 >=dev-qt/qtsql-4.5:4[sqlite] >=media-libs/chromaprint-0.6 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-libs/libechonest:=[qt4] >=media-libs/libmygpo-qt-1.0.8 >=media-libs/taglib-1.8[mp4] sys-libs/zlib virtual/glu virtual/opengl x11-libs/libX11 cdda? ( dev-libs/libcdio ) dbus? ( >=dev-qt/qtdbus-4.5:4 ) ipod? ( >=media-libs/libgpod-0.8.0 ) lastfm? ( >=media-libs/liblastfm-1[qt4(+)] ) mtp? ( >=media-libs/libmtp-1.0.0 ) moodbar? ( sci-libs/fftw:3.0 ) projectm? ( media-libs/glew:= ) >=dev-libs/boost-1.39 virtual/pkgconfig sys-devel/gettext dev-qt/qttest:4 dev-cpp/gmock box? ( dev-cpp/sparsehash ) dropbox? ( dev-cpp/sparsehash ) googledrive? ( dev-cpp/sparsehash ) skydrive? ( dev-cpp/sparsehash ) ubuntu-one? ( dev-cpp/sparsehash ) test? ( gnome-base/gsettings-desktop-schemas ) sys-devel/make >=dev-util/cmake-2.8.12 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=A modern music player and library organizer based on Amarok 1.4 and Qt4
-EAPI=5
-HOMEPAGE=http://www.clementine-player.org https://github.com/clementine-player/Clementine
-IUSE=box cdda +dbus debug dropbox googledrive ipod lastfm mms moodbar mtp projectm skydrive test ubuntu-one +udisks wiimote linguas_af linguas_ar linguas_be linguas_bg linguas_bn linguas_br linguas_bs linguas_ca linguas_cs linguas_cy linguas_da linguas_de linguas_el linguas_en_CA linguas_en_GB linguas_eo linguas_es linguas_et linguas_eu linguas_fa linguas_fi linguas_fr linguas_ga linguas_gl linguas_he linguas_he_IL linguas_hi linguas_hr linguas_hu linguas_hy linguas_ia linguas_id linguas_is linguas_it linguas_ja linguas_ka linguas_kk linguas_ko linguas_lt linguas_lv linguas_mr linguas_ms linguas_my linguas_nb linguas_nl linguas_oc linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_si_LK linguas_sk linguas_sl linguas_sr linguas_sr@latin linguas_sv linguas_te linguas_tr linguas_tr_TR linguas_uk linguas_uz linguas_vi linguas_zh_CN linguas_zh_TW test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-db/sqlite:= >=dev-libs/glib-2.24.1-r1 dev-libs/libxml2 dev-libs/protobuf:= dev-libs/qjson >=dev-qt/qtcore-4.5:4 >=dev-qt/qtgui-4.5:4 >=dev-qt/qtopengl-4.5:4 >=dev-qt/qtsql-4.5:4[sqlite] >=media-libs/chromaprint-0.6 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-libs/libechonest:=[qt4] >=media-libs/libmygpo-qt-1.0.8 >=media-libs/taglib-1.8[mp4] sys-libs/zlib virtual/glu virtual/opengl x11-libs/libX11 cdda? ( dev-libs/libcdio ) dbus? ( >=dev-qt/qtdbus-4.5:4 ) ipod? ( >=media-libs/libgpod-0.8.0 ) lastfm? ( >=media-libs/liblastfm-1[qt4(+)] ) mtp? ( >=media-libs/libmtp-1.0.0 ) moodbar? ( sci-libs/fftw:3.0 ) projectm? ( media-libs/glew:= ) dbus? ( udisks? ( sys-fs/udisks:2 ) ) mms? ( media-plugins/gst-plugins-libmms:1.0 ) mtp? ( gnome-base/gvfs ) projectm? ( >=media-libs/libprojectm-1.2.0 ) media-plugins/gst-plugins-meta:1.0 media-plugins/gst-plugins-soup:1.0 media-plugins/gst-plugins-taglib:1.0
-REQUIRED_USE=udisks? ( dbus ) wiimote? ( dbus )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/clementine-player/Clementine/archive/1.3rc1.tar.gz -> clementine-1.3_rc1.tar.gz
-_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	9d81603248f2ba3ec59124320d123e5e	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=1a44e6dc0b4fc44d8eca6334832015b5
diff --git a/metadata/md5-cache/media-sound/clementine-9999 b/metadata/md5-cache/media-sound/clementine-9999
index bedc6be99ef9..9bc5fda4b3da 100644
--- a/metadata/md5-cache/media-sound/clementine-9999
+++ b/metadata/md5-cache/media-sound/clementine-9999
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DEPEND=dev-db/sqlite:= >=dev-libs/glib-2.24.1-r1 dev-libs/libxml2 dev-libs/protobuf:= dev-libs/qjson >=dev-qt/qtcore-4.5:4 >=dev-qt/qtgui-4.5:4 >=dev-qt/qtopengl-4.5:4 >=dev-qt/qtsql-4.5:4[sqlite] >=media-libs/chromaprint-0.6 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-libs/libechonest:=[qt4] >=media-libs/libmygpo-qt-1.0.8 >=media-libs/taglib-1.8[mp4] sys-libs/zlib virtual/glu virtual/opengl x11-libs/libX11 cdda? ( dev-libs/libcdio ) dbus? ( >=dev-qt/qtdbus-4.5:4 ) ipod? ( >=media-libs/libgpod-0.8.0 ) lastfm? ( >=media-libs/liblastfm-1[qt4(+)] ) mtp? ( >=media-libs/libmtp-1.0.0 ) moodbar? ( sci-libs/fftw:3.0 ) projectm? ( media-libs/glew:= ) >=dev-libs/boost-1.39 virtual/pkgconfig sys-devel/gettext dev-qt/qttest:4 dev-cpp/gmock box? ( dev-cpp/sparsehash ) dropbox? ( dev-cpp/sparsehash ) googledrive? ( dev-cpp/sparsehash ) skydrive? ( dev-cpp/sparsehash ) ubuntu-one? ( dev-cpp/sparsehash ) test? ( gnome-base/gsettings-desktop-schemas ) sys-devel/make >=dev-util/cmake-2.8.12 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-vcs/git
+DEPEND=dev-db/sqlite:= >=dev-libs/glib-2.24.1-r1 dev-libs/libxml2 dev-libs/protobuf:= dev-libs/qjson >=dev-qt/qtcore-4.5:4 >=dev-qt/qtgui-4.5:4 >=dev-qt/qtopengl-4.5:4 >=dev-qt/qtsql-4.5:4[sqlite] >=media-libs/chromaprint-0.6 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-libs/libechonest:=[qt4] >=media-libs/libmygpo-qt-1.0.8 >=media-libs/taglib-1.8[mp4] sys-libs/zlib virtual/glu virtual/opengl x11-libs/libX11 cdda? ( dev-libs/libcdio ) dbus? ( >=dev-qt/qtdbus-4.5:4 ) ipod? ( >=media-libs/libgpod-0.8.0 ) lastfm? ( >=media-libs/liblastfm-1[qt4(+)] ) mtp? ( >=media-libs/libmtp-1.0.0 ) moodbar? ( sci-libs/fftw:3.0 ) projectm? ( media-libs/glew:= ) >=dev-libs/crypto++-5.6.2-r4 >=dev-libs/boost-1.39 virtual/pkgconfig sys-devel/gettext dev-qt/qttest:4 dev-cpp/gmock box? ( dev-cpp/sparsehash ) dropbox? ( dev-cpp/sparsehash ) googledrive? ( dev-cpp/sparsehash ) skydrive? ( dev-cpp/sparsehash ) ubuntu-one? ( dev-cpp/sparsehash ) test? ( gnome-base/gsettings-desktop-schemas ) sys-devel/make >=dev-util/cmake-2.8.12 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-vcs/git
 DESCRIPTION=A modern music player and library organizer based on Amarok 1.4 and Qt4
 EAPI=5
 HOMEPAGE=http://www.clementine-player.org https://github.com/clementine-player/Clementine
 IUSE=box cdda +dbus debug dropbox googledrive ipod lastfm mms moodbar mtp projectm skydrive test ubuntu-one +udisks wiimote linguas_af linguas_ar linguas_be linguas_bg linguas_bn linguas_br linguas_bs linguas_ca linguas_cs linguas_cy linguas_da linguas_de linguas_el linguas_en_CA linguas_en_GB linguas_eo linguas_es linguas_et linguas_eu linguas_fa linguas_fi linguas_fr linguas_ga linguas_gl linguas_he linguas_he_IL linguas_hi linguas_hr linguas_hu linguas_hy linguas_ia linguas_id linguas_is linguas_it linguas_ja linguas_ka linguas_kk linguas_ko linguas_lt linguas_lv linguas_mr linguas_ms linguas_my linguas_nb linguas_nl linguas_oc linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_si_LK linguas_sk linguas_sl linguas_sr linguas_sr@latin linguas_sv linguas_te linguas_tr linguas_tr_TR linguas_uk linguas_uz linguas_vi linguas_zh_CN linguas_zh_TW test
 LICENSE=GPL-3
-RDEPEND=dev-db/sqlite:= >=dev-libs/glib-2.24.1-r1 dev-libs/libxml2 dev-libs/protobuf:= dev-libs/qjson >=dev-qt/qtcore-4.5:4 >=dev-qt/qtgui-4.5:4 >=dev-qt/qtopengl-4.5:4 >=dev-qt/qtsql-4.5:4[sqlite] >=media-libs/chromaprint-0.6 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-libs/libechonest:=[qt4] >=media-libs/libmygpo-qt-1.0.8 >=media-libs/taglib-1.8[mp4] sys-libs/zlib virtual/glu virtual/opengl x11-libs/libX11 cdda? ( dev-libs/libcdio ) dbus? ( >=dev-qt/qtdbus-4.5:4 ) ipod? ( >=media-libs/libgpod-0.8.0 ) lastfm? ( >=media-libs/liblastfm-1[qt4(+)] ) mtp? ( >=media-libs/libmtp-1.0.0 ) moodbar? ( sci-libs/fftw:3.0 ) projectm? ( media-libs/glew:= ) dbus? ( udisks? ( sys-fs/udisks:2 ) ) mms? ( media-plugins/gst-plugins-libmms:1.0 ) mtp? ( gnome-base/gvfs ) projectm? ( >=media-libs/libprojectm-1.2.0 ) media-plugins/gst-plugins-meta:1.0 media-plugins/gst-plugins-soup:1.0 media-plugins/gst-plugins-taglib:1.0
+RDEPEND=dev-db/sqlite:= >=dev-libs/glib-2.24.1-r1 dev-libs/libxml2 dev-libs/protobuf:= dev-libs/qjson >=dev-qt/qtcore-4.5:4 >=dev-qt/qtgui-4.5:4 >=dev-qt/qtopengl-4.5:4 >=dev-qt/qtsql-4.5:4[sqlite] >=media-libs/chromaprint-0.6 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-libs/libechonest:=[qt4] >=media-libs/libmygpo-qt-1.0.8 >=media-libs/taglib-1.8[mp4] sys-libs/zlib virtual/glu virtual/opengl x11-libs/libX11 cdda? ( dev-libs/libcdio ) dbus? ( >=dev-qt/qtdbus-4.5:4 ) ipod? ( >=media-libs/libgpod-0.8.0 ) lastfm? ( >=media-libs/liblastfm-1[qt4(+)] ) mtp? ( >=media-libs/libmtp-1.0.0 ) moodbar? ( sci-libs/fftw:3.0 ) projectm? ( media-libs/glew:= ) >=dev-libs/crypto++-5.6.2-r4 dbus? ( udisks? ( sys-fs/udisks:2 ) ) mms? ( media-plugins/gst-plugins-libmms:1.0 ) mtp? ( gnome-base/gvfs ) projectm? ( >=media-libs/libprojectm-1.2.0 ) media-plugins/gst-plugins-meta:1.0 media-plugins/gst-plugins-soup:1.0 media-plugins/gst-plugins-taglib:1.0
 REQUIRED_USE=udisks? ( dbus ) wiimote? ( dbus )
 RESTRICT=test
 SLOT=0
 _eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	9d81603248f2ba3ec59124320d123e5e	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	d270fa247153df66074f795fa42dba3e	git-2	672c3929a162f221a53b4ccb4d25d8a2	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=1a44e6dc0b4fc44d8eca6334832015b5
+_md5_=60a5366ab8a5beea8bdb1c67e4f56e04
diff --git a/metadata/md5-cache/media-sound/ncmpcpp-0.7.2 b/metadata/md5-cache/media-sound/ncmpcpp-0.7.2
deleted file mode 100644
index e7ce9f5169bf..000000000000
--- a/metadata/md5-cache/media-sound/ncmpcpp-0.7.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=!dev-libs/boost:0/1.57.0 >=media-libs/libmpdclient-2.1 dev-libs/boost:=[nls,threads] sys-libs/ncurses:=[unicode?] sys-libs/readline:* curl? ( net-misc/curl ) taglib? ( media-libs/taglib ) unicode? ( dev-libs/boost:=[icu] ) visualizer? ( sci-libs/fftw:3.0 ) virtual/pkgconfig
-DESCRIPTION=featureful ncurses based MPD client inspired by ncmpc
-EAPI=5
-HOMEPAGE=http://ncmpcpp.rybczak.net/
-IUSE=clock curl outputs taglib unicode visualizer
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=!dev-libs/boost:0/1.57.0 >=media-libs/libmpdclient-2.1 dev-libs/boost:=[nls,threads] sys-libs/ncurses:=[unicode?] sys-libs/readline:* curl? ( net-misc/curl ) taglib? ( media-libs/taglib ) unicode? ( dev-libs/boost:=[icu] ) visualizer? ( sci-libs/fftw:3.0 )
-SLOT=0
-SRC_URI=http://ncmpcpp.rybczak.net/stable/ncmpcpp-0.7.2.tar.bz2
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb
-_md5_=634dde345e9c82f7a5187a4e8234cc8b
diff --git a/metadata/md5-cache/media-sound/ncmpcpp-0.7.1 b/metadata/md5-cache/media-sound/ncmpcpp-0.7.4
similarity index 73%
rename from metadata/md5-cache/media-sound/ncmpcpp-0.7.1
rename to metadata/md5-cache/media-sound/ncmpcpp-0.7.4
index 5530d43ad753..9f8e217f675a 100644
--- a/metadata/md5-cache/media-sound/ncmpcpp-0.7.1
+++ b/metadata/md5-cache/media-sound/ncmpcpp-0.7.4
@@ -1,13 +1,13 @@
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=!dev-libs/boost:0/1.57.0 >=media-libs/libmpdclient-2.1 dev-libs/boost:=[nls,threads] sys-libs/ncurses:=[unicode?] sys-libs/readline:* curl? ( net-misc/curl ) taglib? ( media-libs/taglib ) unicode? ( dev-libs/boost:=[icu] ) visualizer? ( sci-libs/fftw:3.0 ) virtual/pkgconfig
+DEPEND=!dev-libs/boost:0/1.57.0 >=media-libs/libmpdclient-2.1 dev-libs/boost:=[nls,threads] sys-libs/ncurses:=[unicode?] sys-libs/readline:* curl? ( net-misc/curl ) taglib? ( media-libs/taglib ) unicode? ( dev-libs/boost:=[icu] dev-libs/icu:= ) visualizer? ( sci-libs/fftw:3.0= ) virtual/pkgconfig
 DESCRIPTION=featureful ncurses based MPD client inspired by ncmpc
 EAPI=5
 HOMEPAGE=http://ncmpcpp.rybczak.net/
 IUSE=clock curl outputs taglib unicode visualizer
 KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
-RDEPEND=!dev-libs/boost:0/1.57.0 >=media-libs/libmpdclient-2.1 dev-libs/boost:=[nls,threads] sys-libs/ncurses:=[unicode?] sys-libs/readline:* curl? ( net-misc/curl ) taglib? ( media-libs/taglib ) unicode? ( dev-libs/boost:=[icu] ) visualizer? ( sci-libs/fftw:3.0 )
+RDEPEND=!dev-libs/boost:0/1.57.0 >=media-libs/libmpdclient-2.1 dev-libs/boost:=[nls,threads] sys-libs/ncurses:=[unicode?] sys-libs/readline:* curl? ( net-misc/curl ) taglib? ( media-libs/taglib ) unicode? ( dev-libs/boost:=[icu] dev-libs/icu:= ) visualizer? ( sci-libs/fftw:3.0= )
 SLOT=0
-SRC_URI=http://ncmpcpp.rybczak.net/stable/ncmpcpp-0.7.1.tar.bz2
+SRC_URI=http://ncmpcpp.rybczak.net/stable/ncmpcpp-0.7.4.tar.bz2
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb
-_md5_=634dde345e9c82f7a5187a4e8234cc8b
+_md5_=d534a473683a559e49433d78b12932db
diff --git a/metadata/md5-cache/media-tv/mythtv-0.28 b/metadata/md5-cache/media-tv/mythtv-0.28
index 2a074b10ca37..c0386a711745 100644
--- a/metadata/md5-cache/media-tv/mythtv-0.28
+++ b/metadata/md5-cache/media-tv/mythtv-0.28
@@ -1,14 +1,14 @@
 DEFINED_PHASES=config configure info install postinst preinst prepare setup unpack
-DEPEND=>=media-libs/freetype-2.0:= >=media-sound/lame-3.93.1 sys-libs/zlib:= x11-libs/libX11:= x11-libs/libXext:= x11-libs/libXinerama:= x11-libs/libXv:= x11-libs/libXrandr:= x11-libs/libXxf86vm:= dev-qt/qtcore:5= dev-qt/qtdbus:5= dev-qt/qtgui:5= dev-qt/qtscript:5= dev-qt/qtsql:5=[mysql] dev-qt/qtopengl:5= dev-qt/qtwebkit:5= x11-misc/wmctrl:= virtual/mysql virtual/opengl:= alsa? ( >=media-libs/alsa-lib-1.0.24:= ) avahi? ( dev-libs/openssl:0= net-dns/avahi[mdnsresponder-compat] ) bluray? ( dev-libs/libcdio:= media-libs/libbluray:= sys-fs/udisks:0 ) cec? ( dev-libs/libcec:= ) dvb? ( media-libs/libdvb:= virtual/linuxtv-dvb-headers:= ) dvd? ( dev-libs/libcdio:= sys-fs/udisks:0 ) egl? ( media-libs/mesa:=[egl] ) fftw? ( sci-libs/fftw:3.0= ) hls? ( media-libs/faac:= <media-libs/libvpx-1.5.0:= >=media-libs/x264-0.0.20111220:= ) ieee1394? ( >=sys-libs/libraw1394-1.2.0:= >=sys-libs/libavc1394-0.5.3:= >=media-libs/libiec61883-1.0.0:= ) jack? ( media-sound/jack-audio-connection-kit ) lcd? ( app-misc/lcdproc ) libass? ( >=media-libs/libass-0.9.11:= ) lirc? ( app-misc/lirc ) perl? ( dev-perl/DBD-mysql dev-perl/Net-UPnP dev-perl/LWP-Protocol-https dev-perl/HTTP-Message dev-perl/IO-Socket-INET6 >=dev-perl/libwww-perl-5 ) pulseaudio? ( media-sound/pulseaudio ) python? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] dev-python/mysql-python dev-python/lxml dev-python/urlgrabber ) theora? ( media-libs/libtheora:= media-libs/libogg:= ) vaapi? ( x11-libs/libva:=[opengl] ) vdpau? ( x11-libs/libvdpau:= ) vorbis? ( >=media-libs/libvorbis-1.0:= media-libs/libogg:= ) xml? ( >=dev-libs/libxml2-2.6.0:= ) xvid? ( >=media-libs/xvid-1.1.0:= ) !media-tv/mythtv-bindings !x11-themes/mythtv-themes media-libs/taglib:= dev-libs/glib:= systemd? ( sys-apps/systemd:= ) dev-lang/yasm x11-proto/xineramaproto x11-proto/xf86vidmodeproto virtual/pkgconfig
+DEPEND=media-gfx/exiv2:= >=media-libs/freetype-2.0:= >=media-sound/lame-3.93.1 sys-libs/zlib:= x11-libs/libX11:= x11-libs/libXext:= x11-libs/libXinerama:= x11-libs/libXv:= x11-libs/libXrandr:= x11-libs/libXxf86vm:= dev-qt/qtcore:5= dev-qt/qtdbus:5= dev-qt/qtgui:5= dev-qt/qtnetwork:5= dev-qt/qtscript:5= dev-qt/qtsql:5=[mysql] dev-qt/qtopengl:5= dev-qt/qtwebkit:5= dev-qt/qtwidgets:5= dev-qt/qtxml:5= x11-misc/wmctrl:= virtual/mysql virtual/opengl:= alsa? ( >=media-libs/alsa-lib-1.0.24:= ) avahi? ( dev-libs/openssl:0= net-dns/avahi[mdnsresponder-compat] ) bluray? ( dev-libs/libcdio:= media-libs/libbluray:= sys-fs/udisks:0 ) cec? ( dev-libs/libcec:= ) dvb? ( media-libs/libdvb:= virtual/linuxtv-dvb-headers:= ) dvd? ( dev-libs/libcdio:= sys-fs/udisks:0 ) egl? ( media-libs/mesa:=[egl] ) fftw? ( sci-libs/fftw:3.0= ) hls? ( media-libs/faac:= <media-libs/libvpx-1.5.0:= >=media-libs/x264-0.0.20111220:= ) ieee1394? ( >=sys-libs/libraw1394-1.2.0:= >=sys-libs/libavc1394-0.5.3:= >=media-libs/libiec61883-1.0.0:= ) jack? ( media-sound/jack-audio-connection-kit ) lcd? ( app-misc/lcdproc ) libass? ( >=media-libs/libass-0.9.11:= ) lirc? ( app-misc/lirc ) perl? ( dev-perl/DBD-mysql dev-perl/Net-UPnP dev-perl/LWP-Protocol-https dev-perl/HTTP-Message dev-perl/IO-Socket-INET6 >=dev-perl/libwww-perl-5 ) pulseaudio? ( media-sound/pulseaudio ) python? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] dev-python/mysql-python dev-python/lxml dev-python/urlgrabber ) theora? ( media-libs/libtheora:= media-libs/libogg:= ) vaapi? ( x11-libs/libva:=[opengl] ) vdpau? ( x11-libs/libvdpau:= ) vorbis? ( >=media-libs/libvorbis-1.0:= media-libs/libogg:= ) xml? ( >=dev-libs/libxml2-2.6.0:= ) xvid? ( >=media-libs/xvid-1.1.0:= ) !media-tv/mythtv-bindings !x11-themes/mythtv-themes media-libs/taglib:= dev-libs/glib:= systemd? ( sys-apps/systemd:= ) dev-lang/yasm x11-proto/xineramaproto x11-proto/xf86vidmodeproto virtual/pkgconfig
 DESCRIPTION=Homebrew PVR project
 EAPI=5
 HOMEPAGE=http://www.mythtv.org
 IUSE=alsa altivec avahi libass autostart bluray cec crystalhd debug dvb dvd egl fftw +hls ieee1394 jack lcd lirc perl pulseaudio python systemd +theora vaapi vdpau +vorbis +wrapper +xml xmltv +xvid input_devices_joystick python_targets_python2_7
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=media-libs/freetype-2.0:= >=media-sound/lame-3.93.1 sys-libs/zlib:= x11-libs/libX11:= x11-libs/libXext:= x11-libs/libXinerama:= x11-libs/libXv:= x11-libs/libXrandr:= x11-libs/libXxf86vm:= dev-qt/qtcore:5= dev-qt/qtdbus:5= dev-qt/qtgui:5= dev-qt/qtscript:5= dev-qt/qtsql:5=[mysql] dev-qt/qtopengl:5= dev-qt/qtwebkit:5= x11-misc/wmctrl:= virtual/mysql virtual/opengl:= alsa? ( >=media-libs/alsa-lib-1.0.24:= ) avahi? ( dev-libs/openssl:0= net-dns/avahi[mdnsresponder-compat] ) bluray? ( dev-libs/libcdio:= media-libs/libbluray:= sys-fs/udisks:0 ) cec? ( dev-libs/libcec:= ) dvb? ( media-libs/libdvb:= virtual/linuxtv-dvb-headers:= ) dvd? ( dev-libs/libcdio:= sys-fs/udisks:0 ) egl? ( media-libs/mesa:=[egl] ) fftw? ( sci-libs/fftw:3.0= ) hls? ( media-libs/faac:= <media-libs/libvpx-1.5.0:= >=media-libs/x264-0.0.20111220:= ) ieee1394? ( >=sys-libs/libraw1394-1.2.0:= >=sys-libs/libavc1394-0.5.3:= >=media-libs/libiec61883-1.0.0:= ) jack? ( media-sound/jack-audio-connection-kit ) lcd? ( app-misc/lcdproc ) libass? ( >=media-libs/libass-0.9.11:= ) lirc? ( app-misc/lirc ) perl? ( dev-perl/DBD-mysql dev-perl/Net-UPnP dev-perl/LWP-Protocol-https dev-perl/HTTP-Message dev-perl/IO-Socket-INET6 >=dev-perl/libwww-perl-5 ) pulseaudio? ( media-sound/pulseaudio ) python? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] dev-python/mysql-python dev-python/lxml dev-python/urlgrabber ) theora? ( media-libs/libtheora:= media-libs/libogg:= ) vaapi? ( x11-libs/libva:=[opengl] ) vdpau? ( x11-libs/libvdpau:= ) vorbis? ( >=media-libs/libvorbis-1.0:= media-libs/libogg:= ) xml? ( >=dev-libs/libxml2-2.6.0:= ) xvid? ( >=media-libs/xvid-1.1.0:= ) !media-tv/mythtv-bindings !x11-themes/mythtv-themes media-libs/taglib:= dev-libs/glib:= systemd? ( sys-apps/systemd:= ) media-fonts/corefonts media-fonts/dejavu media-fonts/liberation-fonts x11-apps/xinit autostart? ( net-dialup/mingetty x11-wm/evilwm x11-apps/xset ) dvd? ( media-libs/libdvdcss:= ) xmltv? ( >=media-tv/xmltv-0.5.43 )
+RDEPEND=media-gfx/exiv2:= >=media-libs/freetype-2.0:= >=media-sound/lame-3.93.1 sys-libs/zlib:= x11-libs/libX11:= x11-libs/libXext:= x11-libs/libXinerama:= x11-libs/libXv:= x11-libs/libXrandr:= x11-libs/libXxf86vm:= dev-qt/qtcore:5= dev-qt/qtdbus:5= dev-qt/qtgui:5= dev-qt/qtnetwork:5= dev-qt/qtscript:5= dev-qt/qtsql:5=[mysql] dev-qt/qtopengl:5= dev-qt/qtwebkit:5= dev-qt/qtwidgets:5= dev-qt/qtxml:5= x11-misc/wmctrl:= virtual/mysql virtual/opengl:= alsa? ( >=media-libs/alsa-lib-1.0.24:= ) avahi? ( dev-libs/openssl:0= net-dns/avahi[mdnsresponder-compat] ) bluray? ( dev-libs/libcdio:= media-libs/libbluray:= sys-fs/udisks:0 ) cec? ( dev-libs/libcec:= ) dvb? ( media-libs/libdvb:= virtual/linuxtv-dvb-headers:= ) dvd? ( dev-libs/libcdio:= sys-fs/udisks:0 ) egl? ( media-libs/mesa:=[egl] ) fftw? ( sci-libs/fftw:3.0= ) hls? ( media-libs/faac:= <media-libs/libvpx-1.5.0:= >=media-libs/x264-0.0.20111220:= ) ieee1394? ( >=sys-libs/libraw1394-1.2.0:= >=sys-libs/libavc1394-0.5.3:= >=media-libs/libiec61883-1.0.0:= ) jack? ( media-sound/jack-audio-connection-kit ) lcd? ( app-misc/lcdproc ) libass? ( >=media-libs/libass-0.9.11:= ) lirc? ( app-misc/lirc ) perl? ( dev-perl/DBD-mysql dev-perl/Net-UPnP dev-perl/LWP-Protocol-https dev-perl/HTTP-Message dev-perl/IO-Socket-INET6 >=dev-perl/libwww-perl-5 ) pulseaudio? ( media-sound/pulseaudio ) python? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] dev-python/mysql-python dev-python/lxml dev-python/urlgrabber ) theora? ( media-libs/libtheora:= media-libs/libogg:= ) vaapi? ( x11-libs/libva:=[opengl] ) vdpau? ( x11-libs/libvdpau:= ) vorbis? ( >=media-libs/libvorbis-1.0:= media-libs/libogg:= ) xml? ( >=dev-libs/libxml2-2.6.0:= ) xvid? ( >=media-libs/xvid-1.1.0:= ) !media-tv/mythtv-bindings !x11-themes/mythtv-themes media-libs/taglib:= dev-libs/glib:= systemd? ( sys-apps/systemd:= ) media-fonts/corefonts media-fonts/dejavu media-fonts/liberation-fonts x11-apps/xinit autostart? ( net-dialup/mingetty x11-wm/evilwm x11-apps/xset ) dvd? ( media-libs/libdvdcss:= ) xmltv? ( >=media-tv/xmltv-0.5.43 )
 REQUIRED_USE=bluray? ( xml ) python? ( python_targets_python2_7 ) theora? ( vorbis )
 SLOT=0/0.28
 SRC_URI=https://github.com/MythTV/mythtv/archive/3543e74534a39c150e956e2f07f50ed9f873a84e.tar.gz -> mythtv-0.28.tar.gz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	23ae8c186171e6476af098d2a50d0ee0	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	user	906f3c8eb3a2350a4f1191a89baa3e46	vcs-snapshot	b45be87e7012be0af8424e8a5644da1d
-_md5_=fa8ff9ff12b0242161b4351b9d41de73
+_md5_=385410f3a12c029635c6f3bc1f3620c4
diff --git a/metadata/md5-cache/net-analyzer/sguil-server-0.8.0 b/metadata/md5-cache/net-analyzer/sguil-server-0.8.0
index 59dc07cf5d4e..6660a309ae85 100644
--- a/metadata/md5-cache/net-analyzer/sguil-server-0.8.0
+++ b/metadata/md5-cache/net-analyzer/sguil-server-0.8.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst prepare setup
-DEPEND=>=dev-lang/tcl-8.3:0=[-threads] >=dev-tcltk/tclx-8.3 dev-tcltk/tcllib dev-tcltk/mysqltcl ssl? ( >=dev-tcltk/tls-1.4.1 ) ssl? ( dev-libs/openssl:0= )
+DEPEND=>=dev-lang/tcl-8.3:0=[-threads] >=dev-tcltk/tclx-8.3 dev-tcltk/tcllib dev-tcltk/mysqltcl ssl? ( >=dev-tcltk/tls-1.4.1 ) ssl? ( dev-libs/openssl:0 )
 DESCRIPTION=Daemon for Sguil Network Security Monitoring
 EAPI=5
 HOMEPAGE=http://sguil.sourceforge.net
@@ -9,5 +9,5 @@ LICENSE=GPL-2 QPL
 RDEPEND=>=dev-lang/tcl-8.3:0=[-threads] >=dev-tcltk/tclx-8.3 dev-tcltk/tcllib dev-tcltk/mysqltcl ssl? ( >=dev-tcltk/tls-1.4.1 ) net-analyzer/p0f net-analyzer/tcpflow net-misc/openssh
 SLOT=0
 SRC_URI=mirror://sourceforge/sguil/sguil-server-0.8.0.tar.gz
-_eclasses_=multilib	23ae8c186171e6476af098d2a50d0ee0	ssl-cert	b29ef3f715f3a76f1bf807b7e8751096	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	user	906f3c8eb3a2350a4f1191a89baa3e46
+_eclasses_=multilib	23ae8c186171e6476af098d2a50d0ee0	ssl-cert	6f7d720c036362122b0bfb4461e56a11	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	user	906f3c8eb3a2350a4f1191a89baa3e46
 _md5_=d5e16126be8a39e4ea4b7497fd5d247d
diff --git a/metadata/md5-cache/net-analyzer/sguil-server-0.9.0 b/metadata/md5-cache/net-analyzer/sguil-server-0.9.0
index d774127e1fed..ed054c5d0a12 100644
--- a/metadata/md5-cache/net-analyzer/sguil-server-0.9.0
+++ b/metadata/md5-cache/net-analyzer/sguil-server-0.9.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst prepare setup
-DEPEND=>=dev-lang/tcl-8.3:0=[-threads] >=dev-tcltk/tclx-8.3 dev-tcltk/tcllib dev-tcltk/mysqltcl ssl? ( >=dev-tcltk/tls-1.4.1 ) ssl? ( dev-libs/openssl:0= )
+DEPEND=>=dev-lang/tcl-8.3:0=[-threads] >=dev-tcltk/tclx-8.3 dev-tcltk/tcllib dev-tcltk/mysqltcl ssl? ( >=dev-tcltk/tls-1.4.1 ) ssl? ( dev-libs/openssl:0 )
 DESCRIPTION=Daemon for Sguil Network Security Monitoring
 EAPI=5
 HOMEPAGE=http://sguil.sourceforge.net
@@ -9,5 +9,5 @@ LICENSE=GPL-2 QPL
 RDEPEND=>=dev-lang/tcl-8.3:0=[-threads] >=dev-tcltk/tclx-8.3 dev-tcltk/tcllib dev-tcltk/mysqltcl ssl? ( >=dev-tcltk/tls-1.4.1 ) net-analyzer/p0f net-analyzer/tcpflow net-misc/openssh
 SLOT=0
 SRC_URI=https://github.com/bammv/sguil/archive/v0.9.0.tar.gz -> sguil-0.9.0.tar.gz
-_eclasses_=multilib	23ae8c186171e6476af098d2a50d0ee0	ssl-cert	b29ef3f715f3a76f1bf807b7e8751096	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	user	906f3c8eb3a2350a4f1191a89baa3e46
+_eclasses_=multilib	23ae8c186171e6476af098d2a50d0ee0	ssl-cert	6f7d720c036362122b0bfb4461e56a11	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	user	906f3c8eb3a2350a4f1191a89baa3e46
 _md5_=06abede1dcc713eb9a4c153fe5c33506
diff --git a/metadata/md5-cache/net-firewall/nufw-2.2.22-r1 b/metadata/md5-cache/net-firewall/nufw-2.2.22-r1
index 10176304243f..ab223588e7d2 100644
--- a/metadata/md5-cache/net-firewall/nufw-2.2.22-r1
+++ b/metadata/md5-cache/net-firewall/nufw-2.2.22-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=dev-libs/cyrus-sasl dev-libs/glib:2 dev-libs/libgcrypt:0 dev-python/ipy net-firewall/iptables net-libs/gnutls ldap? ( >=net-nds/openldap-2 ) mysql? ( virtual/mysql ) nfconntrack? ( net-libs/libnetfilter_conntrack ) nfqueue? ( net-libs/libnfnetlink net-libs/libnetfilter_queue ) pam? ( sys-libs/pam ) pam_nuauth? ( sys-libs/pam ) postgres? ( dev-db/postgresql[server] ) prelude? ( dev-libs/libprelude ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 dev-libs/openssl:0=
+DEPEND=dev-libs/cyrus-sasl dev-libs/glib:2 dev-libs/libgcrypt:0 dev-python/ipy net-firewall/iptables net-libs/gnutls ldap? ( >=net-nds/openldap-2 ) mysql? ( virtual/mysql ) nfconntrack? ( net-libs/libnetfilter_conntrack ) nfqueue? ( net-libs/libnfnetlink net-libs/libnetfilter_queue ) pam? ( sys-libs/pam ) pam_nuauth? ( sys-libs/pam ) postgres? ( dev-db/postgresql[server] ) prelude? ( dev-libs/libprelude ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 dev-libs/openssl:0
 DESCRIPTION=An enterprise grade authenticating firewall based on netfilter
 EAPI=5
 HOMEPAGE=http://www.nufw.org/
@@ -11,5 +11,5 @@ REQUIRED_USE=pam_nuauth? ( plaintext )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.nufw.org/attachments/download/39/nufw-2.2.22.tar.bz2
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	libtool	4890219c51da247200223277f993e054	multilib	23ae8c186171e6476af098d2a50d0ee0	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	ssl-cert	b29ef3f715f3a76f1bf807b7e8751096	toolchain-funcs	d513d423d449877e49d99af3f7af7acb
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	libtool	4890219c51da247200223277f993e054	multilib	23ae8c186171e6476af098d2a50d0ee0	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	ssl-cert	6f7d720c036362122b0bfb4461e56a11	toolchain-funcs	d513d423d449877e49d99af3f7af7acb
 _md5_=8eb7ada91e577c9868f87833b44cf81c
diff --git a/metadata/md5-cache/net-ftp/netkit-ftpd-0.17-r8 b/metadata/md5-cache/net-ftp/netkit-ftpd-0.17-r8
index 35954df3e259..4ae036004fe8 100644
--- a/metadata/md5-cache/net-ftp/netkit-ftpd-0.17-r8
+++ b/metadata/md5-cache/net-ftp/netkit-ftpd-0.17-r8
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst unpack
-DEPEND=ssl? ( dev-libs/openssl ) ssl? ( dev-libs/openssl:0= )
+DEPEND=ssl? ( dev-libs/openssl ) ssl? ( dev-libs/openssl:0 )
 DESCRIPTION=The netkit FTP server with optional SSL support
 EAPI=0
 HOMEPAGE=http://www.hcs.harvard.edu/~dholland/computers/netkit.html
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=ssl? ( dev-libs/openssl ) virtual/inetd !www-servers/publicfile
 SLOT=0
 SRC_URI=ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/linux-ftpd-0.17.tar.gz mirror://gentoo/linux-ftpd-0.17-ssl.patch
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	multilib	23ae8c186171e6476af098d2a50d0ee0	ssl-cert	b29ef3f715f3a76f1bf807b7e8751096	toolchain-funcs	d513d423d449877e49d99af3f7af7acb
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	multilib	23ae8c186171e6476af098d2a50d0ee0	ssl-cert	6f7d720c036362122b0bfb4461e56a11	toolchain-funcs	d513d423d449877e49d99af3f7af7acb
 _md5_=3b8e29fbabcdb5cf817bd43b5c7e7f01
diff --git a/metadata/md5-cache/net-im/ejabberd-15.03-r1 b/metadata/md5-cache/net-im/ejabberd-15.03-r1
index 8c7c8eb669b4..caf2bd7f0691 100644
--- a/metadata/md5-cache/net-im/ejabberd-15.03-r1
+++ b/metadata/md5-cache/net-im/ejabberd-15.03-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare
-DEPEND=>=net-im/jabber-base-0.01 >=dev-libs/expat-1.95 >=dev-libs/libyaml-0.1.4 >=dev-lang/erlang-15.2[ssl] odbc? ( dev-db/unixODBC ) ldap? ( =net-nds/openldap-2* ) >=dev-libs/openssl-0.9.8e captcha? ( media-gfx/imagemagick[truetype,png] ) zlib? ( >=sys-libs/zlib-1.2.3 ) ssl? ( dev-libs/openssl:0= ) virtual/pkgconfig
+DEPEND=>=net-im/jabber-base-0.01 >=dev-libs/expat-1.95 >=dev-libs/libyaml-0.1.4 >=dev-lang/erlang-15.2[ssl] odbc? ( dev-db/unixODBC ) ldap? ( =net-nds/openldap-2* ) >=dev-libs/openssl-0.9.8e captcha? ( media-gfx/imagemagick[truetype,png] ) zlib? ( >=sys-libs/zlib-1.2.3 ) ssl? ( dev-libs/openssl:0 ) virtual/pkgconfig
 DESCRIPTION=The Erlang Jabber Daemon
 EAPI=5
 HOMEPAGE=http://www.ejabberd.im/ https://github.com/processone/ejabberd/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=net-im/jabber-base-0.01 >=dev-libs/expat-1.95 >=dev-libs/libyaml-0.1.4 >=dev-lang/erlang-15.2[ssl] odbc? ( dev-db/unixODBC ) ldap? ( =net-nds/openldap-2* ) >=dev-libs/openssl-0.9.8e captcha? ( media-gfx/imagemagick[truetype,png] ) zlib? ( >=sys-libs/zlib-1.2.3 ) >=sys-apps/shadow-4.1.4.2-r3 pam? ( virtual/pam )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~radhermit/dist/ejabberd-15.03.tar.xz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	23ae8c186171e6476af098d2a50d0ee0	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	ssl-cert	b29ef3f715f3a76f1bf807b7e8751096	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	d513d423d449877e49d99af3f7af7acb
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	23ae8c186171e6476af098d2a50d0ee0	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	ssl-cert	6f7d720c036362122b0bfb4461e56a11	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	d513d423d449877e49d99af3f7af7acb
 _md5_=27a173651dd5f473b615bbee95d0cabd
diff --git a/metadata/md5-cache/net-im/ejabberd-16.01-r1 b/metadata/md5-cache/net-im/ejabberd-16.01-r1
index 421594604adf..a07d924df9b3 100644
--- a/metadata/md5-cache/net-im/ejabberd-16.01-r1
+++ b/metadata/md5-cache/net-im/ejabberd-16.01-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare
-DEPEND=>=net-im/jabber-base-0.01 >=dev-libs/expat-1.95 >=dev-libs/libyaml-0.1.4 >=dev-lang/erlang-17.1[ssl] odbc? ( dev-db/unixODBC[-minimal] ) ldap? ( =net-nds/openldap-2* ) dev-libs/openssl:0 captcha? ( media-gfx/imagemagick[truetype,png] ) zlib? ( >=sys-libs/zlib-1.2.3 ) ssl? ( dev-libs/openssl:0= ) virtual/pkgconfig
+DEPEND=>=net-im/jabber-base-0.01 >=dev-libs/expat-1.95 >=dev-libs/libyaml-0.1.4 >=dev-lang/erlang-17.1[ssl] odbc? ( dev-db/unixODBC[-minimal] ) ldap? ( =net-nds/openldap-2* ) dev-libs/openssl:0 captcha? ( media-gfx/imagemagick[truetype,png] ) zlib? ( >=sys-libs/zlib-1.2.3 ) ssl? ( dev-libs/openssl:0 ) virtual/pkgconfig
 DESCRIPTION=The Erlang Jabber Daemon
 EAPI=5
 HOMEPAGE=http://www.ejabberd.im/ https://github.com/processone/ejabberd/
@@ -11,5 +11,5 @@ REQUIRED_USE=mssql? ( odbc )
 RESTRICT=mirror
 SLOT=0
 SRC_URI=http://www.process-one.net/downloads/ejabberd/16.01/ejabberd-16.01.tgz mysql? ( https://github.com/processone/mysql/archive/1.0.0.zip -> mysql-1.0.0.zip ) postgres? ( https://github.com/processone/pgsql/archive/1.0.0.zip -> pgsql-1.0.0.zip ) sqlite? ( https://github.com/alexeyr/erlang-sqlite3/archive/cbc3505f7a131254265d3ef56191b2581b8cc172.zip -> erlang-sqlite3-cbc3505f7a131254265d3ef56191b2581b8cc172.zip ) pam? ( https://github.com/processone/epam/archive/1.0.0.zip -> epam-1.0.0.zip ) zlib? ( https://github.com/processone/zlib/archive/1.0.0.zip -> zlib-1.0.0.zip ) riak? ( https://github.com/basho/riak-erlang-client/archive/527722d12d0433b837cdb92a60900c2cb5df8942.zip -> riak-erlang-client-527722d12d0433b837cdb92a60900c2cb5df8942.zip https://github.com/basho/riak_pb/archive/1a43334c03cfe81712c71c6f166b68fe9270f008.zip -> riak_pb-1a43334c03cfe81712c71c6f166b68fe9270f008.zip https://github.com/hyperthunk/hamcrest-erlang/archive/908a24fda4a46776a5135db60ca071e3d783f9f6.zip -> hamcrest-erlang-908a24fda4a46776a5135db60ca071e3d783f9f6.zip https://github.com/basho/erlang_protobuffs/archive/6e7fc924506e2dc166a6170e580ce1d95ebbd5bd.zip -> erlang_protobuffs-6e7fc924506e2dc166a6170e580ce1d95ebbd5bd.zip ) elixir? ( https://github.com/processone/rebar_elixir_plugin/archive/0.1.0.zip -> rebar_elixir_plugin-0.1.0.zip https://github.com/elixir-lang/elixir/archive/f2a9c7016633ca63541a8160c63a53eb7edbccdb.zip -> elixir-f2a9c7016633ca63541a8160c63a53eb7edbccdb.zip ) iconv? ( https://github.com/processone/eiconv/archive/0.9.0.zip -> eiconv-0.9.0.zip ) lager? ( https://github.com/basho/lager/archive/3.0.2.zip -> lager-3.0.2.zip https://github.com/DeadZen/goldrush/archive/212299233c7e7eb63a97be2777e1c05ebaa58dbe.zip -> goldrush-212299233c7e7eb63a97be2777e1c05ebaa58dbe.zip ) !lager? ( https://github.com/processone/p1_logger/archive/1.0.0.zip -> p1_logger-1.0.0.zip ) tools? ( https://github.com/eproxus/meck/archive/0.8.2.zip -> meck-0.8.2.zip ) redis? ( https://github.com/wooga/eredis/archive/cbc013f516e464706493c01662e5e9dd82d1db01.zip -> eredis-cbc013f516e464706493c01662e5e9dd82d1db01.zip ) https://github.com/processone/tls/archive/1.0.0.zip -> tls-1.0.0.zip https://github.com/processone/stringprep/archive/1.0.0.zip -> stringprep-1.0.0.zip https://github.com/processone/xml/archive/1.1.1.zip -> xml-1.1.1.zip https://github.com/processone/p1_sip/archive/1.0.0.zip -> p1_sip-1.0.0.zip https://github.com/processone/stun/archive/0.9.0.zip -> stun-0.9.0.zip https://github.com/processone/p1_yaml/archive/1.0.0.zip -> p1_yaml-1.0.0.zip https://github.com/processone/p1_utils/archive/1.0.2.zip -> p1_utils-1.0.2.zip https://github.com/processone/cache_tab/archive/1.0.1.zip -> cache_tab-1.0.1.zip https://github.com/davisp/jiffy/archive/0.14.5.zip -> jiffy-0.14.5.zip https://github.com/kivra/oauth2/archive/8d129fbf8866930b4ffa6dd84e65bd2b32b9acb8.zip -> oauth2-8d129fbf8866930b4ffa6dd84e65bd2b32b9acb8.zip https://github.com/rds13/xmlrpc/archive/1.15.zip -> xmlrpc-1.15.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	23ae8c186171e6476af098d2a50d0ee0	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	ssl-cert	b29ef3f715f3a76f1bf807b7e8751096	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	d513d423d449877e49d99af3f7af7acb
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	23ae8c186171e6476af098d2a50d0ee0	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	ssl-cert	6f7d720c036362122b0bfb4461e56a11	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	d513d423d449877e49d99af3f7af7acb
 _md5_=903c161d661b77b8fd5a685eca2cee3e
diff --git a/metadata/md5-cache/net-im/ejabberd-2.1.13-r2 b/metadata/md5-cache/net-im/ejabberd-2.1.13-r2
index 3e6038869e70..08b4da7ace16 100644
--- a/metadata/md5-cache/net-im/ejabberd-2.1.13-r2
+++ b/metadata/md5-cache/net-im/ejabberd-2.1.13-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare
-DEPEND=>=net-im/jabber-base-0.01 >=dev-libs/expat-1.95 >=dev-lang/erlang-12.2.5[ssl] <dev-lang/erlang-16 odbc? ( dev-db/unixODBC ) ldap? ( =net-nds/openldap-2* ) >=dev-libs/openssl-0.9.8e captcha? ( media-gfx/imagemagick[truetype,png] ) zlib? ( sys-libs/zlib ) ssl? ( dev-libs/openssl:0= ) virtual/pkgconfig
+DEPEND=>=net-im/jabber-base-0.01 >=dev-libs/expat-1.95 >=dev-lang/erlang-12.2.5[ssl] <dev-lang/erlang-16 odbc? ( dev-db/unixODBC ) ldap? ( =net-nds/openldap-2* ) >=dev-libs/openssl-0.9.8e captcha? ( media-gfx/imagemagick[truetype,png] ) zlib? ( sys-libs/zlib ) ssl? ( dev-libs/openssl:0 ) virtual/pkgconfig
 DESCRIPTION=The Erlang Jabber Daemon
 EAPI=5
 HOMEPAGE=http://www.ejabberd.im/ https://github.com/processone/ejabberd/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=net-im/jabber-base-0.01 >=dev-libs/expat-1.95 >=dev-lang/erlang-12.2.5[ssl] <dev-lang/erlang-16 odbc? ( dev-db/unixODBC ) ldap? ( =net-nds/openldap-2* ) >=dev-libs/openssl-0.9.8e captcha? ( media-gfx/imagemagick[truetype,png] ) zlib? ( sys-libs/zlib ) >=sys-apps/shadow-4.1.4.2-r3 pam? ( virtual/pam )
 SLOT=0
 SRC_URI=http://www.process-one.net/downloads/ejabberd/2.1.13/ejabberd-2.1.13.tgz mod_statsdx? ( https://dev.gentoo.org/~radhermit/dist/ejabberd-mod_statsdx-1118.patch.gz )
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	23ae8c186171e6476af098d2a50d0ee0	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	ssl-cert	b29ef3f715f3a76f1bf807b7e8751096	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	d513d423d449877e49d99af3f7af7acb
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	23ae8c186171e6476af098d2a50d0ee0	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	ssl-cert	6f7d720c036362122b0bfb4461e56a11	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	d513d423d449877e49d99af3f7af7acb
 _md5_=1329dba5ceaf0cd5d2a14d7f7237461c
diff --git a/metadata/md5-cache/net-irc/ptlink-ircd-6.19.6-r2 b/metadata/md5-cache/net-irc/ptlink-ircd-6.19.6-r2
index b81e72e9e1d7..53364a7dfeb7 100644
--- a/metadata/md5-cache/net-irc/ptlink-ircd-6.19.6-r2
+++ b/metadata/md5-cache/net-irc/ptlink-ircd-6.19.6-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare
-DEPEND=sys-libs/zlib ssl? ( dev-libs/openssl:0= ) ssl? ( dev-libs/openssl:0= )
+DEPEND=sys-libs/zlib ssl? ( dev-libs/openssl:0= ) ssl? ( dev-libs/openssl:0 )
 DESCRIPTION=Secure IRC daemon with many advanced features
 EAPI=5
 HOMEPAGE=http://www.ptlink.net/
@@ -8,5 +8,5 @@ KEYWORDS=~ppc ~sparc ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=ftp://ftp.sunsite.dk/projects/ptlink/ircd/PTlink6.19.6.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	multilib	23ae8c186171e6476af098d2a50d0ee0	ssl-cert	b29ef3f715f3a76f1bf807b7e8751096	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	user	906f3c8eb3a2350a4f1191a89baa3e46
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	multilib	23ae8c186171e6476af098d2a50d0ee0	ssl-cert	6f7d720c036362122b0bfb4461e56a11	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	user	906f3c8eb3a2350a4f1191a89baa3e46
 _md5_=4d483a7564d40022d50791e09780fdd8
diff --git a/metadata/md5-cache/net-irc/ultimate-3.0.2-r2 b/metadata/md5-cache/net-irc/ultimate-3.0.2-r2
index f6ddbaa54623..c6cd71a3e826 100644
--- a/metadata/md5-cache/net-irc/ultimate-3.0.2-r2
+++ b/metadata/md5-cache/net-irc/ultimate-3.0.2-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare
-DEPEND=sys-libs/zlib ssl? ( dev-libs/openssl ) virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 ssl? ( dev-libs/openssl:0= )
+DEPEND=sys-libs/zlib ssl? ( dev-libs/openssl ) virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 ssl? ( dev-libs/openssl:0 )
 DESCRIPTION=An IRCd server based on DALnet's DreamForge IRCd
 EAPI=4
 HOMEPAGE=http://www.shadow-realm.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-libs/zlib ssl? ( dev-libs/openssl )
 SLOT=0
 SRC_URI=mirror://sourceforge/ultimate/Ultimate3.0.2.tar.bz2
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	fixheadtails	2f44773656577fe2653bacc8bdcb2174	libtool	4890219c51da247200223277f993e054	multilib	23ae8c186171e6476af098d2a50d0ee0	prefix	e7f2b9c6e57342e5d25eac22fce23062	ssl-cert	b29ef3f715f3a76f1bf807b7e8751096	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	user	906f3c8eb3a2350a4f1191a89baa3e46
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	fixheadtails	2f44773656577fe2653bacc8bdcb2174	libtool	4890219c51da247200223277f993e054	multilib	23ae8c186171e6476af098d2a50d0ee0	prefix	e7f2b9c6e57342e5d25eac22fce23062	ssl-cert	6f7d720c036362122b0bfb4461e56a11	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	user	906f3c8eb3a2350a4f1191a89baa3e46
 _md5_=e8450d6e61fe126a12676cf60026c6c4
diff --git a/metadata/md5-cache/net-irc/unrealircd-3.2.10.4 b/metadata/md5-cache/net-irc/unrealircd-3.2.10.4
index 1dbc3f8d99cd..fe79565516c7 100644
--- a/metadata/md5-cache/net-irc/unrealircd-3.2.10.4
+++ b/metadata/md5-cache/net-irc/unrealircd-3.2.10.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst preinst prepare setup
-DEPEND=ssl? ( dev-libs/openssl ) zlib? ( sys-libs/zlib ) curl? ( net-misc/curl[adns] ) dev-libs/tre >=net-dns/c-ares-1.7 >=sys-apps/sed-4 virtual/pkgconfig ssl? ( dev-libs/openssl:0= )
+DEPEND=ssl? ( dev-libs/openssl ) zlib? ( sys-libs/zlib ) curl? ( net-misc/curl[adns] ) dev-libs/tre >=net-dns/c-ares-1.7 >=sys-apps/sed-4 virtual/pkgconfig ssl? ( dev-libs/openssl:0 )
 DESCRIPTION=An advanced Internet Relay Chat daemon
 EAPI=4
 HOMEPAGE=http://www.unrealircd.com/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=ssl? ( dev-libs/openssl ) zlib? ( sys-libs/zlib ) curl? ( net-misc/curl[adns] ) dev-libs/tre >=net-dns/c-ares-1.7
 SLOT=0
 SRC_URI=http://www.unrealircd.com/downloads/Unreal3.2.10.4.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	multilib	23ae8c186171e6476af098d2a50d0ee0	ssl-cert	b29ef3f715f3a76f1bf807b7e8751096	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	multilib	23ae8c186171e6476af098d2a50d0ee0	ssl-cert	6f7d720c036362122b0bfb4461e56a11	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=02831a9289245348067610d41e2b8adf
diff --git a/metadata/md5-cache/net-mail/altermime-0.3.10 b/metadata/md5-cache/net-mail/altermime-0.3.10
deleted file mode 100644
index 728f98356cb6..000000000000
--- a/metadata/md5-cache/net-mail/altermime-0.3.10
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DESCRIPTION=alterMIME is a small program which is used to alter your mime-encoded mailpacks
-EAPI=2
-HOMEPAGE=http://pldaniels.com/altermime/
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=Sendmail
-SLOT=0
-SRC_URI=http://www.pldaniels.com/altermime/altermime-0.3.10.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb
-_md5_=43a3db8b1d710d3e38ce9b9b30f6334b
diff --git a/metadata/md5-cache/net-mail/altermime-0.3.10-r1 b/metadata/md5-cache/net-mail/altermime-0.3.10-r1
deleted file mode 100644
index 26fa08fb9cfe..000000000000
--- a/metadata/md5-cache/net-mail/altermime-0.3.10-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DESCRIPTION=alterMIME is a small program which is used to alter your mime-encoded mailpacks
-EAPI=2
-HOMEPAGE=http://pldaniels.com/altermime/
-KEYWORDS=amd64 ppc x86
-LICENSE=Sendmail
-SLOT=0
-SRC_URI=http://www.pldaniels.com/altermime/altermime-0.3.10.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb
-_md5_=561c7c53381de695547c391f406f0985
diff --git a/metadata/md5-cache/net-mail/altermime-0.3.7 b/metadata/md5-cache/net-mail/altermime-0.3.7
deleted file mode 100644
index 2f824e9b0b7e..000000000000
--- a/metadata/md5-cache/net-mail/altermime-0.3.7
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DESCRIPTION=alterMIME is a small program which is used to alter your mime-encoded mailpacks
-EAPI=0
-HOMEPAGE=http://pldaniels.com/altermime/
-KEYWORDS=amd64 ppc x86
-LICENSE=Sendmail
-SLOT=0
-SRC_URI=http://www.pldaniels.com/altermime/altermime-0.3.7.tar.gz
-_eclasses_=multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb
-_md5_=44ed738612c84cb911aa82f90d2b2b93
diff --git a/metadata/md5-cache/net-mail/cyrus-imapd-2.4.16 b/metadata/md5-cache/net-mail/cyrus-imapd-2.4.16
index e295ef01e366..8f0a01270049 100644
--- a/metadata/md5-cache/net-mail/cyrus-imapd-2.4.16
+++ b/metadata/md5-cache/net-mail/cyrus-imapd-2.4.16
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=sys-libs/zlib >=dev-libs/cyrus-sasl-2.1.13 afs? ( net-fs/openafs ) berkdb? ( >=sys-libs/db-3.2 ) kerberos? ( virtual/krb5 ) mysql? ( virtual/mysql ) nntp? ( !net-nntp/leafnode ) pam? ( virtual/pam >=net-mail/mailbase-1 ) postgres? ( dev-db/postgresql ) snmp? ( >=net-analyzer/net-snmp-5.2.2-r1 ) sqlite? ( dev-db/sqlite ) ssl? ( >=dev-libs/openssl-0.9.6 ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 snmp? ( net-analyzer/net-snmp[tcpd=] ) ) ssl? ( dev-libs/openssl:0= )
+DEPEND=sys-libs/zlib >=dev-libs/cyrus-sasl-2.1.13 afs? ( net-fs/openafs ) berkdb? ( >=sys-libs/db-3.2 ) kerberos? ( virtual/krb5 ) mysql? ( virtual/mysql ) nntp? ( !net-nntp/leafnode ) pam? ( virtual/pam >=net-mail/mailbase-1 ) postgres? ( dev-db/postgresql ) snmp? ( >=net-analyzer/net-snmp-5.2.2-r1 ) sqlite? ( dev-db/sqlite ) ssl? ( >=dev-libs/openssl-0.9.6 ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 snmp? ( net-analyzer/net-snmp[tcpd=] ) ) ssl? ( dev-libs/openssl:0 )
 DESCRIPTION=The Cyrus IMAP Server
 EAPI=4
 HOMEPAGE=http://www.cyrusimap.org/
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib >=dev-libs/cyrus-sasl-2.1.13 afs? ( net-fs/openafs ) berkd
 REQUIRED_USE=afs? ( kerberos )
 SLOT=0
 SRC_URI=ftp://ftp.cyrusimap.org/cyrus-imapd/cyrus-imapd-2.4.16.tar.gz
-_eclasses_=db-use	a4966c7f4f7df444ead1212848c13cc9	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	23ae8c186171e6476af098d2a50d0ee0	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	ssl-cert	b29ef3f715f3a76f1bf807b7e8751096	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=db-use	a4966c7f4f7df444ead1212848c13cc9	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	23ae8c186171e6476af098d2a50d0ee0	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	ssl-cert	6f7d720c036362122b0bfb4461e56a11	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f70cea51fecbcc77e55db5269ef9da1f
diff --git a/metadata/md5-cache/net-mail/cyrus-imapd-2.4.17 b/metadata/md5-cache/net-mail/cyrus-imapd-2.4.17
index 93fba041fd50..2649f6f5629c 100644
--- a/metadata/md5-cache/net-mail/cyrus-imapd-2.4.17
+++ b/metadata/md5-cache/net-mail/cyrus-imapd-2.4.17
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst preinst prepare setup
-DEPEND=sys-libs/zlib >=dev-libs/cyrus-sasl-2.1.13 afs? ( net-fs/openafs ) berkdb? ( >=sys-libs/db-3.2 ) kerberos? ( virtual/krb5 ) mysql? ( virtual/mysql ) nntp? ( !net-nntp/leafnode ) pam? ( virtual/pam >=net-mail/mailbase-1 ) postgres? ( dev-db/postgresql ) snmp? ( >=net-analyzer/net-snmp-5.2.2-r1 ) sqlite? ( dev-db/sqlite ) ssl? ( >=dev-libs/openssl-0.9.6 ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 snmp? ( net-analyzer/net-snmp[tcpd=] ) ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ssl? ( dev-libs/openssl:0= )
+DEPEND=sys-libs/zlib >=dev-libs/cyrus-sasl-2.1.13 afs? ( net-fs/openafs ) berkdb? ( >=sys-libs/db-3.2 ) kerberos? ( virtual/krb5 ) mysql? ( virtual/mysql ) nntp? ( !net-nntp/leafnode ) pam? ( virtual/pam >=net-mail/mailbase-1 ) postgres? ( dev-db/postgresql ) snmp? ( >=net-analyzer/net-snmp-5.2.2-r1 ) sqlite? ( dev-db/sqlite ) ssl? ( >=dev-libs/openssl-0.9.6 ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 snmp? ( net-analyzer/net-snmp[tcpd=] ) ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ssl? ( dev-libs/openssl:0 )
 DESCRIPTION=The Cyrus IMAP Server
 EAPI=4
 HOMEPAGE=http://www.cyrusimap.org/
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib >=dev-libs/cyrus-sasl-2.1.13 afs? ( net-fs/openafs ) berkd
 REQUIRED_USE=afs? ( kerberos )
 SLOT=0
 SRC_URI=ftp://ftp.cyrusimap.org/cyrus-imapd/cyrus-imapd-2.4.17.tar.gz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	db-use	a4966c7f4f7df444ead1212848c13cc9	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	libtool	4890219c51da247200223277f993e054	multilib	23ae8c186171e6476af098d2a50d0ee0	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	ssl-cert	b29ef3f715f3a76f1bf807b7e8751096	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	db-use	a4966c7f4f7df444ead1212848c13cc9	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	libtool	4890219c51da247200223277f993e054	multilib	23ae8c186171e6476af098d2a50d0ee0	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	ssl-cert	6f7d720c036362122b0bfb4461e56a11	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=14cb610947df373741b7de3e7e872f0e
diff --git a/metadata/md5-cache/net-mail/cyrus-imapd-2.4.17-r1 b/metadata/md5-cache/net-mail/cyrus-imapd-2.4.17-r1
index a60b308fed0f..bb7ef2c9fb9a 100644
--- a/metadata/md5-cache/net-mail/cyrus-imapd-2.4.17-r1
+++ b/metadata/md5-cache/net-mail/cyrus-imapd-2.4.17-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst preinst prepare setup
-DEPEND=sys-libs/zlib >=dev-libs/cyrus-sasl-2.1.13 afs? ( net-fs/openafs ) berkdb? ( >=sys-libs/db-3.2 ) kerberos? ( virtual/krb5 ) mysql? ( >=virtual/mysql-5.5 ) nntp? ( !net-nntp/leafnode ) pam? ( virtual/pam >=net-mail/mailbase-1 ) postgres? ( dev-db/postgresql ) snmp? ( >=net-analyzer/net-snmp-5.2.2-r1 ) sqlite? ( dev-db/sqlite ) ssl? ( >=dev-libs/openssl-0.9.6 ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 snmp? ( net-analyzer/net-snmp[tcpd=] ) ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ssl? ( dev-libs/openssl:0= )
+DEPEND=sys-libs/zlib >=dev-libs/cyrus-sasl-2.1.13 afs? ( net-fs/openafs ) berkdb? ( >=sys-libs/db-3.2 ) kerberos? ( virtual/krb5 ) mysql? ( >=virtual/mysql-5.5 ) nntp? ( !net-nntp/leafnode ) pam? ( virtual/pam >=net-mail/mailbase-1 ) postgres? ( dev-db/postgresql ) snmp? ( >=net-analyzer/net-snmp-5.2.2-r1 ) sqlite? ( dev-db/sqlite ) ssl? ( >=dev-libs/openssl-0.9.6 ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 snmp? ( net-analyzer/net-snmp[tcpd=] ) ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ssl? ( dev-libs/openssl:0 )
 DESCRIPTION=The Cyrus IMAP Server
 EAPI=4
 HOMEPAGE=http://www.cyrusimap.org/
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib >=dev-libs/cyrus-sasl-2.1.13 afs? ( net-fs/openafs ) berkd
 REQUIRED_USE=afs? ( kerberos )
 SLOT=0
 SRC_URI=ftp://ftp.cyrusimap.org/cyrus-imapd/cyrus-imapd-2.4.17.tar.gz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	db-use	a4966c7f4f7df444ead1212848c13cc9	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	libtool	4890219c51da247200223277f993e054	multilib	23ae8c186171e6476af098d2a50d0ee0	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	ssl-cert	b29ef3f715f3a76f1bf807b7e8751096	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	db-use	a4966c7f4f7df444ead1212848c13cc9	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	libtool	4890219c51da247200223277f993e054	multilib	23ae8c186171e6476af098d2a50d0ee0	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	ssl-cert	6f7d720c036362122b0bfb4461e56a11	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=211a352514adf18a83b4a80a751e8ec8
diff --git a/metadata/md5-cache/net-mail/cyrus-imapd-2.4.18 b/metadata/md5-cache/net-mail/cyrus-imapd-2.4.18
index c031d9e7ecb9..43b18555ceb8 100644
--- a/metadata/md5-cache/net-mail/cyrus-imapd-2.4.18
+++ b/metadata/md5-cache/net-mail/cyrus-imapd-2.4.18
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst preinst prepare setup
-DEPEND=sys-libs/zlib >=dev-libs/cyrus-sasl-2.1.13 afs? ( net-fs/openafs ) berkdb? ( >=sys-libs/db-3.2:* ) kerberos? ( virtual/krb5 ) mysql? ( >=virtual/mysql-5.5 ) nntp? ( !net-nntp/leafnode ) pam? ( virtual/pam >=net-mail/mailbase-1 ) postgres? ( dev-db/postgresql:* ) snmp? ( >=net-analyzer/net-snmp-5.2.2-r1 ) sqlite? ( dev-db/sqlite:3 ) ssl? ( >=dev-libs/openssl-0.9.6:* ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 snmp? ( net-analyzer/net-snmp[tcpd=] ) ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ssl? ( dev-libs/openssl:0= )
+DEPEND=sys-libs/zlib >=dev-libs/cyrus-sasl-2.1.13 afs? ( net-fs/openafs ) berkdb? ( >=sys-libs/db-3.2:* ) kerberos? ( virtual/krb5 ) mysql? ( >=virtual/mysql-5.5 ) nntp? ( !net-nntp/leafnode ) pam? ( virtual/pam >=net-mail/mailbase-1 ) postgres? ( dev-db/postgresql:* ) snmp? ( >=net-analyzer/net-snmp-5.2.2-r1 ) sqlite? ( dev-db/sqlite:3 ) ssl? ( >=dev-libs/openssl-0.9.6:* ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 snmp? ( net-analyzer/net-snmp[tcpd=] ) ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ssl? ( dev-libs/openssl:0 )
 DESCRIPTION=The Cyrus IMAP Server
 EAPI=5
 HOMEPAGE=http://www.cyrusimap.org/
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib >=dev-libs/cyrus-sasl-2.1.13 afs? ( net-fs/openafs ) berkd
 REQUIRED_USE=afs? ( kerberos )
 SLOT=0
 SRC_URI=ftp://ftp.cyrusimap.org/cyrus-imapd/cyrus-imapd-2.4.18.tar.gz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	db-use	a4966c7f4f7df444ead1212848c13cc9	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	libtool	4890219c51da247200223277f993e054	multilib	23ae8c186171e6476af098d2a50d0ee0	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	ssl-cert	b29ef3f715f3a76f1bf807b7e8751096	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	db-use	a4966c7f4f7df444ead1212848c13cc9	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	libtool	4890219c51da247200223277f993e054	multilib	23ae8c186171e6476af098d2a50d0ee0	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	ssl-cert	6f7d720c036362122b0bfb4461e56a11	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=23797d8cd89ac1356b564b79f1ce0c7c
diff --git a/metadata/md5-cache/net-mail/cyrus-imapd-2.5.4 b/metadata/md5-cache/net-mail/cyrus-imapd-2.5.4
index 9e551854ff90..ae38b766799c 100644
--- a/metadata/md5-cache/net-mail/cyrus-imapd-2.5.4
+++ b/metadata/md5-cache/net-mail/cyrus-imapd-2.5.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst preinst prepare setup
-DEPEND=sys-libs/zlib dev-libs/libpcre >=dev-libs/cyrus-sasl-2.1.13 dev-libs/jansson afs? ( net-fs/openafs ) berkdb? ( >=sys-libs/db-3.2:* ) clamav? ( app-antivirus/clamav ) http? ( dev-libs/libxml2 dev-libs/libical ) kerberos? ( virtual/krb5 ) mysql? ( >=virtual/mysql-5.5 ) nntp? ( !net-nntp/leafnode ) pam? ( virtual/pam >=net-mail/mailbase-1 ) postgres? ( dev-db/postgresql:* ) snmp? ( >=net-analyzer/net-snmp-5.2.2-r1 ) sqlite? ( dev-db/sqlite:3 ) ssl? ( >=dev-libs/openssl-1.0.1e:* ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 snmp? ( net-analyzer/net-snmp[tcpd=] ) ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ssl? ( dev-libs/openssl:0= )
+DEPEND=sys-libs/zlib dev-libs/libpcre >=dev-libs/cyrus-sasl-2.1.13 dev-libs/jansson afs? ( net-fs/openafs ) berkdb? ( >=sys-libs/db-3.2:* ) clamav? ( app-antivirus/clamav ) http? ( dev-libs/libxml2 dev-libs/libical ) kerberos? ( virtual/krb5 ) mysql? ( >=virtual/mysql-5.5 ) nntp? ( !net-nntp/leafnode ) pam? ( virtual/pam >=net-mail/mailbase-1 ) postgres? ( dev-db/postgresql:* ) snmp? ( >=net-analyzer/net-snmp-5.2.2-r1 ) sqlite? ( dev-db/sqlite:3 ) ssl? ( >=dev-libs/openssl-1.0.1e:* ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 snmp? ( net-analyzer/net-snmp[tcpd=] ) ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ssl? ( dev-libs/openssl:0 )
 DESCRIPTION=The Cyrus IMAP Server
 EAPI=5
 HOMEPAGE=http://www.cyrusimap.org/
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib dev-libs/libpcre >=dev-libs/cyrus-sasl-2.1.13 dev-libs/jan
 REQUIRED_USE=afs? ( kerberos )
 SLOT=0
 SRC_URI=ftp://ftp.cyrusimap.org/cyrus-imapd/cyrus-imapd-2.5.4.tar.gz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	libtool	4890219c51da247200223277f993e054	multilib	23ae8c186171e6476af098d2a50d0ee0	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	ssl-cert	b29ef3f715f3a76f1bf807b7e8751096	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	user	906f3c8eb3a2350a4f1191a89baa3e46
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	libtool	4890219c51da247200223277f993e054	multilib	23ae8c186171e6476af098d2a50d0ee0	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	ssl-cert	6f7d720c036362122b0bfb4461e56a11	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	user	906f3c8eb3a2350a4f1191a89baa3e46
 _md5_=cc19fd4650a1f877df710ab9693b5292
diff --git a/metadata/md5-cache/net-mail/cyrus-imapd-2.5.5 b/metadata/md5-cache/net-mail/cyrus-imapd-2.5.5
index b14ec30695ef..e7cb7746f9e8 100644
--- a/metadata/md5-cache/net-mail/cyrus-imapd-2.5.5
+++ b/metadata/md5-cache/net-mail/cyrus-imapd-2.5.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst preinst prepare setup
-DEPEND=sys-libs/zlib dev-libs/libpcre >=dev-libs/cyrus-sasl-2.1.13 dev-libs/jansson afs? ( net-fs/openafs ) berkdb? ( >=sys-libs/db-3.2:* ) clamav? ( app-antivirus/clamav ) http? ( dev-libs/libxml2 dev-libs/libical ) kerberos? ( virtual/krb5 ) mysql? ( >=virtual/mysql-5.5 ) nntp? ( !net-nntp/leafnode ) pam? ( virtual/pam >=net-mail/mailbase-1 ) postgres? ( dev-db/postgresql:* ) snmp? ( >=net-analyzer/net-snmp-5.2.2-r1 ) sqlite? ( dev-db/sqlite:3 ) ssl? ( >=dev-libs/openssl-1.0.1e:* ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 snmp? ( net-analyzer/net-snmp[tcpd=] ) ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ssl? ( dev-libs/openssl:0= )
+DEPEND=sys-libs/zlib dev-libs/libpcre >=dev-libs/cyrus-sasl-2.1.13 dev-libs/jansson afs? ( net-fs/openafs ) berkdb? ( >=sys-libs/db-3.2:* ) clamav? ( app-antivirus/clamav ) http? ( dev-libs/libxml2 dev-libs/libical ) kerberos? ( virtual/krb5 ) mysql? ( >=virtual/mysql-5.5 ) nntp? ( !net-nntp/leafnode ) pam? ( virtual/pam >=net-mail/mailbase-1 ) postgres? ( dev-db/postgresql:* ) snmp? ( >=net-analyzer/net-snmp-5.2.2-r1 ) sqlite? ( dev-db/sqlite:3 ) ssl? ( >=dev-libs/openssl-1.0.1e:* ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 snmp? ( net-analyzer/net-snmp[tcpd=] ) ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ssl? ( dev-libs/openssl:0 )
 DESCRIPTION=The Cyrus IMAP Server
 EAPI=5
 HOMEPAGE=http://www.cyrusimap.org/
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib dev-libs/libpcre >=dev-libs/cyrus-sasl-2.1.13 dev-libs/jan
 REQUIRED_USE=afs? ( kerberos )
 SLOT=0
 SRC_URI=ftp://ftp.cyrusimap.org/cyrus-imapd/cyrus-imapd-2.5.5.tar.gz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	libtool	4890219c51da247200223277f993e054	multilib	23ae8c186171e6476af098d2a50d0ee0	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	ssl-cert	b29ef3f715f3a76f1bf807b7e8751096	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	user	906f3c8eb3a2350a4f1191a89baa3e46
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	libtool	4890219c51da247200223277f993e054	multilib	23ae8c186171e6476af098d2a50d0ee0	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	ssl-cert	6f7d720c036362122b0bfb4461e56a11	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	user	906f3c8eb3a2350a4f1191a89baa3e46
 _md5_=cc19fd4650a1f877df710ab9693b5292
diff --git a/metadata/md5-cache/net-mail/cyrus-imapd-2.5.6 b/metadata/md5-cache/net-mail/cyrus-imapd-2.5.6
index 1b6b70636c59..f5cbcfbd71de 100644
--- a/metadata/md5-cache/net-mail/cyrus-imapd-2.5.6
+++ b/metadata/md5-cache/net-mail/cyrus-imapd-2.5.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst preinst prepare setup
-DEPEND=sys-libs/zlib dev-libs/libpcre >=dev-libs/cyrus-sasl-2.1.13 dev-libs/jansson afs? ( net-fs/openafs ) berkdb? ( >=sys-libs/db-3.2:* ) clamav? ( app-antivirus/clamav ) http? ( dev-libs/libxml2 dev-libs/libical ) kerberos? ( virtual/krb5 ) mysql? ( >=virtual/mysql-5.5 ) nntp? ( !net-nntp/leafnode ) pam? ( virtual/pam >=net-mail/mailbase-1 ) postgres? ( dev-db/postgresql:* ) snmp? ( >=net-analyzer/net-snmp-5.2.2-r1 ) sqlite? ( dev-db/sqlite:3 ) ssl? ( >=dev-libs/openssl-1.0.1e:* ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 snmp? ( net-analyzer/net-snmp[tcpd=] ) ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ssl? ( dev-libs/openssl:0= )
+DEPEND=sys-libs/zlib dev-libs/libpcre >=dev-libs/cyrus-sasl-2.1.13 dev-libs/jansson afs? ( net-fs/openafs ) berkdb? ( >=sys-libs/db-3.2:* ) clamav? ( app-antivirus/clamav ) http? ( dev-libs/libxml2 dev-libs/libical ) kerberos? ( virtual/krb5 ) mysql? ( >=virtual/mysql-5.5 ) nntp? ( !net-nntp/leafnode ) pam? ( virtual/pam >=net-mail/mailbase-1 ) postgres? ( dev-db/postgresql:* ) snmp? ( >=net-analyzer/net-snmp-5.2.2-r1 ) sqlite? ( dev-db/sqlite:3 ) ssl? ( >=dev-libs/openssl-1.0.1e:* ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 snmp? ( net-analyzer/net-snmp[tcpd=] ) ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ssl? ( dev-libs/openssl:0 )
 DESCRIPTION=The Cyrus IMAP Server
 EAPI=5
 HOMEPAGE=http://www.cyrusimap.org/
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib dev-libs/libpcre >=dev-libs/cyrus-sasl-2.1.13 dev-libs/jan
 REQUIRED_USE=afs? ( kerberos )
 SLOT=0
 SRC_URI=ftp://ftp.cyrusimap.org/cyrus-imapd/cyrus-imapd-2.5.6.tar.gz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	libtool	4890219c51da247200223277f993e054	multilib	23ae8c186171e6476af098d2a50d0ee0	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	ssl-cert	b29ef3f715f3a76f1bf807b7e8751096	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	user	906f3c8eb3a2350a4f1191a89baa3e46
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	libtool	4890219c51da247200223277f993e054	multilib	23ae8c186171e6476af098d2a50d0ee0	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	ssl-cert	6f7d720c036362122b0bfb4461e56a11	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	user	906f3c8eb3a2350a4f1191a89baa3e46
 _md5_=a524ce17e869a9d22c844d2cd7cda207
diff --git a/metadata/md5-cache/net-mail/cyrus-imapd-2.5.7 b/metadata/md5-cache/net-mail/cyrus-imapd-2.5.7
index 8985e183c3bf..a1ec7f483ef0 100644
--- a/metadata/md5-cache/net-mail/cyrus-imapd-2.5.7
+++ b/metadata/md5-cache/net-mail/cyrus-imapd-2.5.7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst preinst prepare setup
-DEPEND=sys-libs/zlib dev-libs/libpcre >=dev-libs/cyrus-sasl-2.1.13 dev-libs/jansson afs? ( net-fs/openafs ) berkdb? ( >=sys-libs/db-3.2:* ) clamav? ( app-antivirus/clamav ) http? ( dev-libs/libxml2 dev-libs/libical ) kerberos? ( virtual/krb5 ) mysql? ( >=virtual/mysql-5.5 ) nntp? ( !net-nntp/leafnode ) pam? ( virtual/pam >=net-mail/mailbase-1 ) postgres? ( dev-db/postgresql:* ) snmp? ( >=net-analyzer/net-snmp-5.2.2-r1 ) sqlite? ( dev-db/sqlite:3 ) ssl? ( >=dev-libs/openssl-1.0.1e:0[-bindist] ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 snmp? ( net-analyzer/net-snmp[tcpd=] ) ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ssl? ( dev-libs/openssl:0= )
+DEPEND=sys-libs/zlib dev-libs/libpcre >=dev-libs/cyrus-sasl-2.1.13 dev-libs/jansson afs? ( net-fs/openafs ) berkdb? ( >=sys-libs/db-3.2:* ) clamav? ( app-antivirus/clamav ) http? ( dev-libs/libxml2 dev-libs/libical ) kerberos? ( virtual/krb5 ) mysql? ( >=virtual/mysql-5.5 ) nntp? ( !net-nntp/leafnode ) pam? ( virtual/pam >=net-mail/mailbase-1 ) postgres? ( dev-db/postgresql:* ) snmp? ( >=net-analyzer/net-snmp-5.2.2-r1 ) sqlite? ( dev-db/sqlite:3 ) ssl? ( >=dev-libs/openssl-1.0.1e:0[-bindist] ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 snmp? ( net-analyzer/net-snmp[tcpd=] ) ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ssl? ( dev-libs/openssl:0 )
 DESCRIPTION=The Cyrus IMAP Server
 EAPI=5
 HOMEPAGE=http://www.cyrusimap.org/
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib dev-libs/libpcre >=dev-libs/cyrus-sasl-2.1.13 dev-libs/jan
 REQUIRED_USE=afs? ( kerberos )
 SLOT=0
 SRC_URI=ftp://ftp.cyrusimap.org/cyrus-imapd/cyrus-imapd-2.5.7.tar.gz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	libtool	4890219c51da247200223277f993e054	multilib	23ae8c186171e6476af098d2a50d0ee0	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	ssl-cert	b29ef3f715f3a76f1bf807b7e8751096	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	user	906f3c8eb3a2350a4f1191a89baa3e46
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	libtool	4890219c51da247200223277f993e054	multilib	23ae8c186171e6476af098d2a50d0ee0	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	ssl-cert	6f7d720c036362122b0bfb4461e56a11	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	user	906f3c8eb3a2350a4f1191a89baa3e46
 _md5_=6e04d9ce2258d917927bf8b275d0f66b
diff --git a/metadata/md5-cache/net-mail/dot-forward-0.71-r2 b/metadata/md5-cache/net-mail/dot-forward-0.71-r2
deleted file mode 100644
index f48253780342..000000000000
--- a/metadata/md5-cache/net-mail/dot-forward-0.71-r2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install setup unpack
-DESCRIPTION=reads sendmail's .forward files under qmail
-EAPI=0
-HOMEPAGE=http://cr.yp.to/dot-forward.html
-KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86
-LICENSE=public-domain
-RESTRICT=test
-SLOT=0
-SRC_URI=http://cr.yp.to/software/dot-forward-0.71.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	user	906f3c8eb3a2350a4f1191a89baa3e46
-_md5_=f0b21b51c56e8ce97ef91a487c3001e8
diff --git a/metadata/md5-cache/net-mail/dovecot-2.2.19 b/metadata/md5-cache/net-mail/dovecot-2.2.19
index 686d7aede994..3b374307ffe8 100644
--- a/metadata/md5-cache/net-mail/dovecot-2.2.19
+++ b/metadata/md5-cache/net-mail/dovecot-2.2.19
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=bzip2? ( app-arch/bzip2 ) caps? ( sys-libs/libcap ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) lucene? ( >=dev-cpp/clucene-2.3 ) lzma? ( app-arch/xz-utils ) lz4? ( app-arch/lz4 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] ) selinux? ( sec-policy/selinux-dovecot ) solr? ( net-misc/curl dev-libs/expat ) sqlite? ( dev-db/sqlite:* ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) tcpd? ( sys-apps/tcp-wrappers ) vpopmail? ( net-mail/vpopmail ) zlib? ( sys-libs/zlib ) virtual/libiconv dev-libs/icu:= ssl? ( dev-libs/openssl:0= ) virtual/pkgconfig
+DEPEND=bzip2? ( app-arch/bzip2 ) caps? ( sys-libs/libcap ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) lucene? ( >=dev-cpp/clucene-2.3 ) lzma? ( app-arch/xz-utils ) lz4? ( app-arch/lz4 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] ) selinux? ( sec-policy/selinux-dovecot ) solr? ( net-misc/curl dev-libs/expat ) sqlite? ( dev-db/sqlite:* ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) tcpd? ( sys-apps/tcp-wrappers ) vpopmail? ( net-mail/vpopmail ) zlib? ( sys-libs/zlib ) virtual/libiconv dev-libs/icu:= ssl? ( dev-libs/openssl:0 ) virtual/pkgconfig
 DESCRIPTION=An IMAP and POP3 server written with security primarily in mind
 EAPI=5
 HOMEPAGE=http://www.dovecot.org/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1 MIT
 RDEPEND=bzip2? ( app-arch/bzip2 ) caps? ( sys-libs/libcap ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) lucene? ( >=dev-cpp/clucene-2.3 ) lzma? ( app-arch/xz-utils ) lz4? ( app-arch/lz4 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] ) selinux? ( sec-policy/selinux-dovecot ) solr? ( net-misc/curl dev-libs/expat ) sqlite? ( dev-db/sqlite:* ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) tcpd? ( sys-apps/tcp-wrappers ) vpopmail? ( net-mail/vpopmail ) zlib? ( sys-libs/zlib ) virtual/libiconv dev-libs/icu:= net-mail/mailbase
 SLOT=0
 SRC_URI=http://dovecot.org/releases/2.2/dovecot-2.2.19.tar.gz sieve? ( http://pigeonhole.dovecot.org/releases/2.2/dovecot-2.2-pigeonhole-0.4.9.tar.gz ) managesieve? ( http://pigeonhole.dovecot.org/releases/2.2/dovecot-2.2-pigeonhole-0.4.9.tar.gz )
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	multilib	23ae8c186171e6476af098d2a50d0ee0	ssl-cert	b29ef3f715f3a76f1bf807b7e8751096	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	multilib	23ae8c186171e6476af098d2a50d0ee0	ssl-cert	6f7d720c036362122b0bfb4461e56a11	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=7bbf85131baae772878537b51b114cf8
diff --git a/metadata/md5-cache/net-mail/dovecot-2.2.19-r1 b/metadata/md5-cache/net-mail/dovecot-2.2.19-r1
index 98fb41d2ea07..494575e9fa5a 100644
--- a/metadata/md5-cache/net-mail/dovecot-2.2.19-r1
+++ b/metadata/md5-cache/net-mail/dovecot-2.2.19-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=bzip2? ( app-arch/bzip2 ) caps? ( sys-libs/libcap ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) lucene? ( >=dev-cpp/clucene-2.3 ) lzma? ( app-arch/xz-utils ) lz4? ( app-arch/lz4 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] ) selinux? ( sec-policy/selinux-dovecot ) solr? ( net-misc/curl dev-libs/expat ) sqlite? ( dev-db/sqlite:* ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) tcpd? ( sys-apps/tcp-wrappers ) textcat? ( app-text/libexttextcat ) vpopmail? ( net-mail/vpopmail ) zlib? ( sys-libs/zlib ) virtual/libiconv dev-libs/icu:= ssl? ( dev-libs/openssl:0= ) virtual/pkgconfig
+DEPEND=bzip2? ( app-arch/bzip2 ) caps? ( sys-libs/libcap ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) lucene? ( >=dev-cpp/clucene-2.3 ) lzma? ( app-arch/xz-utils ) lz4? ( app-arch/lz4 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] ) selinux? ( sec-policy/selinux-dovecot ) solr? ( net-misc/curl dev-libs/expat ) sqlite? ( dev-db/sqlite:* ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) tcpd? ( sys-apps/tcp-wrappers ) textcat? ( app-text/libexttextcat ) vpopmail? ( net-mail/vpopmail ) zlib? ( sys-libs/zlib ) virtual/libiconv dev-libs/icu:= ssl? ( dev-libs/openssl:0 ) virtual/pkgconfig
 DESCRIPTION=An IMAP and POP3 server written with security primarily in mind
 EAPI=5
 HOMEPAGE=http://www.dovecot.org/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1 MIT
 RDEPEND=bzip2? ( app-arch/bzip2 ) caps? ( sys-libs/libcap ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) lucene? ( >=dev-cpp/clucene-2.3 ) lzma? ( app-arch/xz-utils ) lz4? ( app-arch/lz4 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] ) selinux? ( sec-policy/selinux-dovecot ) solr? ( net-misc/curl dev-libs/expat ) sqlite? ( dev-db/sqlite:* ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) tcpd? ( sys-apps/tcp-wrappers ) textcat? ( app-text/libexttextcat ) vpopmail? ( net-mail/vpopmail ) zlib? ( sys-libs/zlib ) virtual/libiconv dev-libs/icu:= net-mail/mailbase
 SLOT=0
 SRC_URI=http://dovecot.org/releases/2.2/dovecot-2.2.19.tar.gz sieve? ( http://pigeonhole.dovecot.org/releases/2.2/dovecot-2.2-pigeonhole-0.4.9.tar.gz ) managesieve? ( http://pigeonhole.dovecot.org/releases/2.2/dovecot-2.2-pigeonhole-0.4.9.tar.gz )
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	multilib	23ae8c186171e6476af098d2a50d0ee0	ssl-cert	b29ef3f715f3a76f1bf807b7e8751096	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	multilib	23ae8c186171e6476af098d2a50d0ee0	ssl-cert	6f7d720c036362122b0bfb4461e56a11	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f804c680c16c3657100fd7d25fb3d1b9
diff --git a/metadata/md5-cache/net-mail/dovecot-2.2.21 b/metadata/md5-cache/net-mail/dovecot-2.2.21
index 598ef067f62d..e29f05f9353a 100644
--- a/metadata/md5-cache/net-mail/dovecot-2.2.21
+++ b/metadata/md5-cache/net-mail/dovecot-2.2.21
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=bzip2? ( app-arch/bzip2 ) caps? ( sys-libs/libcap ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) lucene? ( >=dev-cpp/clucene-2.3 ) lzma? ( app-arch/xz-utils ) lz4? ( app-arch/lz4 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] ) selinux? ( sec-policy/selinux-dovecot ) solr? ( net-misc/curl dev-libs/expat ) sqlite? ( dev-db/sqlite:* ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) tcpd? ( sys-apps/tcp-wrappers ) textcat? ( app-text/libexttextcat ) vpopmail? ( net-mail/vpopmail ) zlib? ( sys-libs/zlib ) virtual/libiconv dev-libs/icu:= ssl? ( dev-libs/openssl:0= ) virtual/pkgconfig
+DEPEND=bzip2? ( app-arch/bzip2 ) caps? ( sys-libs/libcap ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) lucene? ( >=dev-cpp/clucene-2.3 ) lzma? ( app-arch/xz-utils ) lz4? ( app-arch/lz4 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] ) selinux? ( sec-policy/selinux-dovecot ) solr? ( net-misc/curl dev-libs/expat ) sqlite? ( dev-db/sqlite:* ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) tcpd? ( sys-apps/tcp-wrappers ) textcat? ( app-text/libexttextcat ) vpopmail? ( net-mail/vpopmail ) zlib? ( sys-libs/zlib ) virtual/libiconv dev-libs/icu:= ssl? ( dev-libs/openssl:0 ) virtual/pkgconfig
 DESCRIPTION=An IMAP and POP3 server written with security primarily in mind
 EAPI=5
 HOMEPAGE=http://www.dovecot.org/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1 MIT
 RDEPEND=bzip2? ( app-arch/bzip2 ) caps? ( sys-libs/libcap ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) lucene? ( >=dev-cpp/clucene-2.3 ) lzma? ( app-arch/xz-utils ) lz4? ( app-arch/lz4 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] ) selinux? ( sec-policy/selinux-dovecot ) solr? ( net-misc/curl dev-libs/expat ) sqlite? ( dev-db/sqlite:* ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) tcpd? ( sys-apps/tcp-wrappers ) textcat? ( app-text/libexttextcat ) vpopmail? ( net-mail/vpopmail ) zlib? ( sys-libs/zlib ) virtual/libiconv dev-libs/icu:= net-mail/mailbase
 SLOT=0
 SRC_URI=http://dovecot.org/releases/2.2/dovecot-2.2.21.tar.gz sieve? ( http://pigeonhole.dovecot.org/releases/2.2/dovecot-2.2-pigeonhole-0.4.10.tar.gz ) managesieve? ( http://pigeonhole.dovecot.org/releases/2.2/dovecot-2.2-pigeonhole-0.4.10.tar.gz )
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	multilib	23ae8c186171e6476af098d2a50d0ee0	ssl-cert	b29ef3f715f3a76f1bf807b7e8751096	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	multilib	23ae8c186171e6476af098d2a50d0ee0	ssl-cert	6f7d720c036362122b0bfb4461e56a11	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=68fb961b6f28a010673b1ae162b99536
diff --git a/metadata/md5-cache/net-mail/dovecot-2.2.21-r1 b/metadata/md5-cache/net-mail/dovecot-2.2.21-r1
index 4038a79ebcce..6b0f5f66f072 100644
--- a/metadata/md5-cache/net-mail/dovecot-2.2.21-r1
+++ b/metadata/md5-cache/net-mail/dovecot-2.2.21-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=bzip2? ( app-arch/bzip2 ) caps? ( sys-libs/libcap ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) lucene? ( >=dev-cpp/clucene-2.3 ) lzma? ( app-arch/xz-utils ) lz4? ( app-arch/lz4 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] ) selinux? ( sec-policy/selinux-dovecot ) solr? ( net-misc/curl dev-libs/expat ) sqlite? ( dev-db/sqlite:* ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) tcpd? ( sys-apps/tcp-wrappers ) textcat? ( app-text/libexttextcat ) vpopmail? ( net-mail/vpopmail ) zlib? ( sys-libs/zlib ) virtual/libiconv dev-libs/icu:= ssl? ( dev-libs/openssl:0= ) virtual/pkgconfig
+DEPEND=bzip2? ( app-arch/bzip2 ) caps? ( sys-libs/libcap ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) lucene? ( >=dev-cpp/clucene-2.3 ) lzma? ( app-arch/xz-utils ) lz4? ( app-arch/lz4 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] ) selinux? ( sec-policy/selinux-dovecot ) solr? ( net-misc/curl dev-libs/expat ) sqlite? ( dev-db/sqlite:* ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) tcpd? ( sys-apps/tcp-wrappers ) textcat? ( app-text/libexttextcat ) vpopmail? ( net-mail/vpopmail ) zlib? ( sys-libs/zlib ) virtual/libiconv dev-libs/icu:= ssl? ( dev-libs/openssl:0 ) virtual/pkgconfig
 DESCRIPTION=An IMAP and POP3 server written with security primarily in mind
 EAPI=5
 HOMEPAGE=http://www.dovecot.org/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1 MIT
 RDEPEND=bzip2? ( app-arch/bzip2 ) caps? ( sys-libs/libcap ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) lucene? ( >=dev-cpp/clucene-2.3 ) lzma? ( app-arch/xz-utils ) lz4? ( app-arch/lz4 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] ) selinux? ( sec-policy/selinux-dovecot ) solr? ( net-misc/curl dev-libs/expat ) sqlite? ( dev-db/sqlite:* ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) tcpd? ( sys-apps/tcp-wrappers ) textcat? ( app-text/libexttextcat ) vpopmail? ( net-mail/vpopmail ) zlib? ( sys-libs/zlib ) virtual/libiconv dev-libs/icu:= net-mail/mailbase
 SLOT=0
 SRC_URI=http://dovecot.org/releases/2.2/dovecot-2.2.21.tar.gz sieve? ( http://pigeonhole.dovecot.org/releases/2.2/dovecot-2.2-pigeonhole-0.4.11.tar.gz ) managesieve? ( http://pigeonhole.dovecot.org/releases/2.2/dovecot-2.2-pigeonhole-0.4.11.tar.gz )
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	multilib	23ae8c186171e6476af098d2a50d0ee0	ssl-cert	b29ef3f715f3a76f1bf807b7e8751096	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	multilib	23ae8c186171e6476af098d2a50d0ee0	ssl-cert	6f7d720c036362122b0bfb4461e56a11	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=cc840cc31dbe2904501aebaba8a6fc18
diff --git a/metadata/md5-cache/net-mail/dovecot-2.2.21-r2 b/metadata/md5-cache/net-mail/dovecot-2.2.21-r2
index 1d847d93653b..51e02e40afc4 100644
--- a/metadata/md5-cache/net-mail/dovecot-2.2.21-r2
+++ b/metadata/md5-cache/net-mail/dovecot-2.2.21-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=bzip2? ( app-arch/bzip2 ) caps? ( sys-libs/libcap ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) lucene? ( >=dev-cpp/clucene-2.3 ) lzma? ( app-arch/xz-utils ) lz4? ( app-arch/lz4 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] ) selinux? ( sec-policy/selinux-dovecot ) solr? ( net-misc/curl dev-libs/expat ) sqlite? ( dev-db/sqlite:* ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) tcpd? ( sys-apps/tcp-wrappers ) textcat? ( app-text/libexttextcat ) vpopmail? ( net-mail/vpopmail ) zlib? ( sys-libs/zlib ) virtual/libiconv dev-libs/icu:= ssl? ( dev-libs/openssl:0= ) virtual/pkgconfig
+DEPEND=bzip2? ( app-arch/bzip2 ) caps? ( sys-libs/libcap ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) lucene? ( >=dev-cpp/clucene-2.3 ) lzma? ( app-arch/xz-utils ) lz4? ( app-arch/lz4 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] ) selinux? ( sec-policy/selinux-dovecot ) solr? ( net-misc/curl dev-libs/expat ) sqlite? ( dev-db/sqlite:* ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) tcpd? ( sys-apps/tcp-wrappers ) textcat? ( app-text/libexttextcat ) vpopmail? ( net-mail/vpopmail ) zlib? ( sys-libs/zlib ) virtual/libiconv dev-libs/icu:= ssl? ( dev-libs/openssl:0 ) virtual/pkgconfig
 DESCRIPTION=An IMAP and POP3 server written with security primarily in mind
 EAPI=5
 HOMEPAGE=http://www.dovecot.org/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1 MIT
 RDEPEND=bzip2? ( app-arch/bzip2 ) caps? ( sys-libs/libcap ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) lucene? ( >=dev-cpp/clucene-2.3 ) lzma? ( app-arch/xz-utils ) lz4? ( app-arch/lz4 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] ) selinux? ( sec-policy/selinux-dovecot ) solr? ( net-misc/curl dev-libs/expat ) sqlite? ( dev-db/sqlite:* ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) tcpd? ( sys-apps/tcp-wrappers ) textcat? ( app-text/libexttextcat ) vpopmail? ( net-mail/vpopmail ) zlib? ( sys-libs/zlib ) virtual/libiconv dev-libs/icu:= net-mail/mailbase
 SLOT=0
 SRC_URI=http://dovecot.org/releases/2.2/dovecot-2.2.21.tar.gz sieve? ( http://pigeonhole.dovecot.org/releases/2.2/dovecot-2.2-pigeonhole-0.4.12.tar.gz ) managesieve? ( http://pigeonhole.dovecot.org/releases/2.2/dovecot-2.2-pigeonhole-0.4.12.tar.gz )
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	multilib	23ae8c186171e6476af098d2a50d0ee0	ssl-cert	b29ef3f715f3a76f1bf807b7e8751096	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	multilib	23ae8c186171e6476af098d2a50d0ee0	ssl-cert	6f7d720c036362122b0bfb4461e56a11	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=08dcf968ac062e21a9b1a6407fc491e4
diff --git a/metadata/md5-cache/net-mail/dovecot-2.2.22 b/metadata/md5-cache/net-mail/dovecot-2.2.22
index 07e1e9a5fd52..cbe926094f8f 100644
--- a/metadata/md5-cache/net-mail/dovecot-2.2.22
+++ b/metadata/md5-cache/net-mail/dovecot-2.2.22
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=bzip2? ( app-arch/bzip2 ) caps? ( sys-libs/libcap ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) lucene? ( >=dev-cpp/clucene-2.3 ) lzma? ( app-arch/xz-utils ) lz4? ( app-arch/lz4 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] ) selinux? ( sec-policy/selinux-dovecot ) solr? ( net-misc/curl dev-libs/expat ) sqlite? ( dev-db/sqlite:* ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) tcpd? ( sys-apps/tcp-wrappers ) textcat? ( app-text/libexttextcat ) vpopmail? ( net-mail/vpopmail ) zlib? ( sys-libs/zlib ) virtual/libiconv dev-libs/icu:= ssl? ( dev-libs/openssl:0= ) virtual/pkgconfig
+DEPEND=bzip2? ( app-arch/bzip2 ) caps? ( sys-libs/libcap ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) lucene? ( >=dev-cpp/clucene-2.3 ) lzma? ( app-arch/xz-utils ) lz4? ( app-arch/lz4 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] ) selinux? ( sec-policy/selinux-dovecot ) solr? ( net-misc/curl dev-libs/expat ) sqlite? ( dev-db/sqlite:* ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) tcpd? ( sys-apps/tcp-wrappers ) textcat? ( app-text/libexttextcat ) vpopmail? ( net-mail/vpopmail ) zlib? ( sys-libs/zlib ) virtual/libiconv dev-libs/icu:= ssl? ( dev-libs/openssl:0 ) virtual/pkgconfig
 DESCRIPTION=An IMAP and POP3 server written with security primarily in mind
 EAPI=6
 HOMEPAGE=http://www.dovecot.org/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1 MIT
 RDEPEND=bzip2? ( app-arch/bzip2 ) caps? ( sys-libs/libcap ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) lucene? ( >=dev-cpp/clucene-2.3 ) lzma? ( app-arch/xz-utils ) lz4? ( app-arch/lz4 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] ) selinux? ( sec-policy/selinux-dovecot ) solr? ( net-misc/curl dev-libs/expat ) sqlite? ( dev-db/sqlite:* ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) tcpd? ( sys-apps/tcp-wrappers ) textcat? ( app-text/libexttextcat ) vpopmail? ( net-mail/vpopmail ) zlib? ( sys-libs/zlib ) virtual/libiconv dev-libs/icu:= net-mail/mailbase
 SLOT=0
 SRC_URI=http://dovecot.org/releases/2.2/dovecot-2.2.22.tar.gz sieve? ( http://pigeonhole.dovecot.org/releases/2.2/dovecot-2.2-pigeonhole-0.4.13.tar.gz ) managesieve? ( http://pigeonhole.dovecot.org/releases/2.2/dovecot-2.2-pigeonhole-0.4.13.tar.gz )
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	multilib	23ae8c186171e6476af098d2a50d0ee0	ssl-cert	b29ef3f715f3a76f1bf807b7e8751096	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	multilib	23ae8c186171e6476af098d2a50d0ee0	ssl-cert	6f7d720c036362122b0bfb4461e56a11	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=955d4b22e56bf055a60a3b4f0c8e43fa
diff --git a/metadata/md5-cache/net-mail/dovecot-2.2.23 b/metadata/md5-cache/net-mail/dovecot-2.2.23
index 3ec4e1b76092..417af9eee7dc 100644
--- a/metadata/md5-cache/net-mail/dovecot-2.2.23
+++ b/metadata/md5-cache/net-mail/dovecot-2.2.23
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=bzip2? ( app-arch/bzip2 ) caps? ( sys-libs/libcap ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) lucene? ( >=dev-cpp/clucene-2.3 ) lzma? ( app-arch/xz-utils ) lz4? ( app-arch/lz4 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] ) selinux? ( sec-policy/selinux-dovecot ) solr? ( net-misc/curl dev-libs/expat ) sqlite? ( dev-db/sqlite:* ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) tcpd? ( sys-apps/tcp-wrappers ) textcat? ( app-text/libexttextcat ) vpopmail? ( net-mail/vpopmail ) zlib? ( sys-libs/zlib ) virtual/libiconv dev-libs/icu:= ssl? ( dev-libs/openssl:0= ) virtual/pkgconfig
+DEPEND=bzip2? ( app-arch/bzip2 ) caps? ( sys-libs/libcap ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) lucene? ( >=dev-cpp/clucene-2.3 ) lzma? ( app-arch/xz-utils ) lz4? ( app-arch/lz4 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] ) selinux? ( sec-policy/selinux-dovecot ) solr? ( net-misc/curl dev-libs/expat ) sqlite? ( dev-db/sqlite:* ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) tcpd? ( sys-apps/tcp-wrappers ) textcat? ( app-text/libexttextcat ) vpopmail? ( net-mail/vpopmail ) zlib? ( sys-libs/zlib ) virtual/libiconv dev-libs/icu:= ssl? ( dev-libs/openssl:0 ) virtual/pkgconfig
 DESCRIPTION=An IMAP and POP3 server written with security primarily in mind
 EAPI=6
 HOMEPAGE=http://www.dovecot.org/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1 MIT
 RDEPEND=bzip2? ( app-arch/bzip2 ) caps? ( sys-libs/libcap ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) lucene? ( >=dev-cpp/clucene-2.3 ) lzma? ( app-arch/xz-utils ) lz4? ( app-arch/lz4 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] ) selinux? ( sec-policy/selinux-dovecot ) solr? ( net-misc/curl dev-libs/expat ) sqlite? ( dev-db/sqlite:* ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) tcpd? ( sys-apps/tcp-wrappers ) textcat? ( app-text/libexttextcat ) vpopmail? ( net-mail/vpopmail ) zlib? ( sys-libs/zlib ) virtual/libiconv dev-libs/icu:= net-mail/mailbase
 SLOT=0
 SRC_URI=http://dovecot.org/releases/2.2/dovecot-2.2.23.tar.gz sieve? ( http://pigeonhole.dovecot.org/releases/2.2/dovecot-2.2-pigeonhole-0.4.13.tar.gz ) managesieve? ( http://pigeonhole.dovecot.org/releases/2.2/dovecot-2.2-pigeonhole-0.4.13.tar.gz )
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	multilib	23ae8c186171e6476af098d2a50d0ee0	ssl-cert	b29ef3f715f3a76f1bf807b7e8751096	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	multilib	23ae8c186171e6476af098d2a50d0ee0	ssl-cert	6f7d720c036362122b0bfb4461e56a11	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=955d4b22e56bf055a60a3b4f0c8e43fa
diff --git a/metadata/md5-cache/net-mail/mlmmj-1.2.17.1 b/metadata/md5-cache/net-mail/mlmmj-1.2.17.1
deleted file mode 100644
index 83d18f86ea0f..000000000000
--- a/metadata/md5-cache/net-mail/mlmmj-1.2.17.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst unpack
-DEPEND=virtual/mta
-DESCRIPTION=Mailing list managing made joyful
-EAPI=0
-HOMEPAGE=http://mlmmj.org/
-KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=MIT
-RDEPEND=virtual/mta
-SLOT=0
-SRC_URI=http://mlmmj.org/releases/mlmmj-1.2.17.1.tar.bz2
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb
-_md5_=b3e1b4c086f2f089c15015788eeef063
diff --git a/metadata/md5-cache/net-mail/qpopper-4.1.0 b/metadata/md5-cache/net-mail/qpopper-4.1.0
index e660a9ad98e3..bb9e28f0a968 100644
--- a/metadata/md5-cache/net-mail/qpopper-4.1.0
+++ b/metadata/md5-cache/net-mail/qpopper-4.1.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=virtual/mta >=net-mail/mailbase-0.00-r8 xinetd? ( virtual/inetd ) gdbm? ( sys-libs/gdbm ) drac? ( mail-client/drac ) pam? ( >=sys-libs/pam-0.72 ) ssl? ( dev-libs/openssl ) ssl? ( dev-libs/openssl:0= )
+DEPEND=virtual/mta >=net-mail/mailbase-0.00-r8 xinetd? ( virtual/inetd ) gdbm? ( sys-libs/gdbm ) drac? ( mail-client/drac ) pam? ( >=sys-libs/pam-0.72 ) ssl? ( dev-libs/openssl ) ssl? ( dev-libs/openssl:0 )
 DESCRIPTION=A POP3 Server
 EAPI=4
 HOMEPAGE=http://www.eudora.com/products/unsupported/qpopper/index.html
@@ -9,5 +9,5 @@ LICENSE=qpopper ISOC-rfc
 RDEPEND=virtual/mta >=net-mail/mailbase-0.00-r8 xinetd? ( virtual/inetd ) gdbm? ( sys-libs/gdbm ) drac? ( mail-client/drac ) pam? ( >=sys-libs/pam-0.72 ) ssl? ( dev-libs/openssl )
 SLOT=0
 SRC_URI=ftp://ftp.qualcomm.com/eudora/servers/unix/popper/qpopper4.1.0.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	multilib	23ae8c186171e6476af098d2a50d0ee0	ssl-cert	b29ef3f715f3a76f1bf807b7e8751096	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	user	906f3c8eb3a2350a4f1191a89baa3e46
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	multilib	23ae8c186171e6476af098d2a50d0ee0	ssl-cert	6f7d720c036362122b0bfb4461e56a11	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	user	906f3c8eb3a2350a4f1191a89baa3e46
 _md5_=e44ab74dc0287b6a9ba4435ead1aa55e
diff --git a/metadata/md5-cache/net-mail/uw-imap-2007f b/metadata/md5-cache/net-mail/uw-imap-2007f
index 18fc13143145..d33014824b64 100644
--- a/metadata/md5-cache/net-mail/uw-imap-2007f
+++ b/metadata/md5-cache/net-mail/uw-imap-2007f
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst prepare unpack
-DEPEND=!net-libs/c-client >=sys-libs/pam-0.72 >=net-mail/mailbase-0.00-r8[pam] ssl? ( dev-libs/openssl ) kerberos? ( app-crypt/mit-krb5 ) ssl? ( dev-libs/openssl:0= )
+DEPEND=!net-libs/c-client >=sys-libs/pam-0.72 >=net-mail/mailbase-0.00-r8[pam] ssl? ( dev-libs/openssl ) kerberos? ( app-crypt/mit-krb5 ) ssl? ( dev-libs/openssl:0 )
 DESCRIPTION=UW server daemons for IMAP and POP network mail protocols
 EAPI=4
 HOMEPAGE=http://www.washington.edu/imap/
@@ -10,5 +10,5 @@ RDEPEND=!net-libs/c-client >=sys-libs/pam-0.72 >=net-mail/mailbase-0.00-r8[pam]
 REQUIRED_USE=!clearpasswd? ( ssl )
 SLOT=0
 SRC_URI=ftp://ftp.cac.washington.edu/imap/imap-2007f.tar.Z
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	23ae8c186171e6476af098d2a50d0ee0	ssl-cert	b29ef3f715f3a76f1bf807b7e8751096	toolchain-funcs	d513d423d449877e49d99af3f7af7acb
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	23ae8c186171e6476af098d2a50d0ee0	ssl-cert	6f7d720c036362122b0bfb4461e56a11	toolchain-funcs	d513d423d449877e49d99af3f7af7acb
 _md5_=f7bbcedfdc0f070b7ff1252773269279
diff --git a/metadata/md5-cache/net-mail/uw-imap-2007f-r1 b/metadata/md5-cache/net-mail/uw-imap-2007f-r1
index a08868b11eed..e550537905b1 100644
--- a/metadata/md5-cache/net-mail/uw-imap-2007f-r1
+++ b/metadata/md5-cache/net-mail/uw-imap-2007f-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst prepare unpack
-DEPEND=!net-libs/c-client >=sys-libs/pam-0.72 >=net-mail/mailbase-0.00-r8[pam] ssl? ( dev-libs/openssl ) kerberos? ( app-crypt/mit-krb5 ) ssl? ( dev-libs/openssl:0= )
+DEPEND=!net-libs/c-client >=sys-libs/pam-0.72 >=net-mail/mailbase-0.00-r8[pam] ssl? ( dev-libs/openssl ) kerberos? ( app-crypt/mit-krb5 ) ssl? ( dev-libs/openssl:0 )
 DESCRIPTION=UW server daemons for IMAP and POP network mail protocols
 EAPI=4
 HOMEPAGE=http://www.washington.edu/imap/
@@ -10,5 +10,5 @@ RDEPEND=!net-libs/c-client >=sys-libs/pam-0.72 >=net-mail/mailbase-0.00-r8[pam]
 REQUIRED_USE=!clearpasswd? ( ssl )
 SLOT=0
 SRC_URI=ftp://ftp.cac.washington.edu/imap/imap-2007f.tar.Z
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	23ae8c186171e6476af098d2a50d0ee0	ssl-cert	b29ef3f715f3a76f1bf807b7e8751096	toolchain-funcs	d513d423d449877e49d99af3f7af7acb
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	23ae8c186171e6476af098d2a50d0ee0	ssl-cert	6f7d720c036362122b0bfb4461e56a11	toolchain-funcs	d513d423d449877e49d99af3f7af7acb
 _md5_=03b6eb80e4422a794af54b069e1073ea
diff --git a/metadata/md5-cache/net-mail/vchkuser-0.3.3 b/metadata/md5-cache/net-mail/vchkuser-0.3.3
deleted file mode 100644
index f5a71cbeadf1..000000000000
--- a/metadata/md5-cache/net-mail/vchkuser-0.3.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=net-mail/vpopmail || ( mail-mta/netqmail[qmail-spp] mail-mta/qmail-ldap[qmail-spp] ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4
-DESCRIPTION=qmail-spp plugin to check recipient existance with vpopmail
-EAPI=2
-HOMEPAGE=https://github.com/hollow/vchkuser
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-SLOT=0
-SRC_URI=http://bb.xnull.de/projects/vchkuser/dist/vchkuser-0.3.3.tar.bz2
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	fixheadtails	2f44773656577fe2653bacc8bdcb2174	flag-o-matic	d270fa247153df66074f795fa42dba3e	libtool	4890219c51da247200223277f993e054	multilib	23ae8c186171e6476af098d2a50d0ee0	qmail	b5cb479953f486ad5e0d7f5a428f5913	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	user	906f3c8eb3a2350a4f1191a89baa3e46
-_md5_=67e82d4c11ec8550cd89606c18917ad0
diff --git a/metadata/md5-cache/net-mail/vpopmail-5.4.16 b/metadata/md5-cache/net-mail/vpopmail-5.4.16
deleted file mode 100644
index ac0d270f76c1..000000000000
--- a/metadata/md5-cache/net-mail/vpopmail-5.4.16
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst setup unpack
-DEPEND=sys-apps/sed sys-apps/ucspi-tcp virtual/qmail mysql? ( virtual/mysql ) >=sys-apps/sed-4 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=A collection of programs to manage virtual email domains and accounts on your Qmail mail servers
-EAPI=0
-HOMEPAGE=http://www.inter7.com/index.php?page=vpopmail
-IUSE=mysql ipalias clearpasswd
-KEYWORDS=amd64 arm hppa ~ia64 ppc s390 sh sparc x86
-LICENSE=GPL-2
-RDEPEND=virtual/qmail mysql? ( virtual/mysql ) virtual/cron
-RESTRICT=userpriv
-SLOT=0
-SRC_URI=mirror://sourceforge/vpopmail/vpopmail-5.4.16.tar.gz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	fixheadtails	2f44773656577fe2653bacc8bdcb2174	libtool	4890219c51da247200223277f993e054	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	user	906f3c8eb3a2350a4f1191a89baa3e46
-_md5_=cd3bb40ad92b18d6a12de28086ed227e
diff --git a/metadata/md5-cache/net-mail/vpopmail-5.4.30-r1 b/metadata/md5-cache/net-mail/vpopmail-5.4.30-r1
deleted file mode 100644
index 15e12e2589c7..000000000000
--- a/metadata/md5-cache/net-mail/vpopmail-5.4.30-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup
-DEPEND=virtual/qmail maildrop? ( mail-filter/maildrop ) mysql? ( virtual/mysql ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 >=sys-apps/sed-4
-DESCRIPTION=A collection of programs to manage virtual email domains and accounts on your Qmail mail servers
-EAPI=2
-HOMEPAGE=http://www.inter7.com/index.php?page=vpopmail
-IUSE=clearpasswd ipalias maildrop mysql
-KEYWORDS=amd64 arm hppa ia64 ppc s390 sh sparc x86
-LICENSE=GPL-2
-RDEPEND=virtual/qmail maildrop? ( mail-filter/maildrop ) mysql? ( virtual/mysql )
-SLOT=0
-SRC_URI=mirror://sourceforge/vpopmail/vpopmail-5.4.30.tar.gz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	fixheadtails	2f44773656577fe2653bacc8bdcb2174	flag-o-matic	d270fa247153df66074f795fa42dba3e	libtool	4890219c51da247200223277f993e054	multilib	23ae8c186171e6476af098d2a50d0ee0	qmail	b5cb479953f486ad5e0d7f5a428f5913	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	user	906f3c8eb3a2350a4f1191a89baa3e46
-_md5_=a6f7ef72eb3dd0bc79a9fc3c8bd7adff
diff --git a/metadata/md5-cache/net-mail/vpopmail-5.4.30-r2 b/metadata/md5-cache/net-mail/vpopmail-5.4.30-r2
deleted file mode 100644
index f856df75a57e..000000000000
--- a/metadata/md5-cache/net-mail/vpopmail-5.4.30-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup
-DEPEND=virtual/qmail maildrop? ( mail-filter/maildrop ) mysql? ( virtual/mysql ) spamassassin? ( mail-filter/spamassassin ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 >=sys-apps/sed-4
-DESCRIPTION=A collection of programs to manage virtual email domains and accounts on your Qmail mail servers
-EAPI=2
-HOMEPAGE=http://www.inter7.com/index.php?page=vpopmail
-IUSE=clearpasswd ipalias maildrop mysql spamassassin
-KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=virtual/qmail maildrop? ( mail-filter/maildrop ) mysql? ( virtual/mysql ) spamassassin? ( mail-filter/spamassassin )
-SLOT=0
-SRC_URI=mirror://sourceforge/vpopmail/vpopmail-5.4.30.tar.gz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	fixheadtails	2f44773656577fe2653bacc8bdcb2174	flag-o-matic	d270fa247153df66074f795fa42dba3e	libtool	4890219c51da247200223277f993e054	multilib	23ae8c186171e6476af098d2a50d0ee0	qmail	b5cb479953f486ad5e0d7f5a428f5913	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	user	906f3c8eb3a2350a4f1191a89baa3e46
-_md5_=770c85e46021f8e5ac576eb7c4980561
diff --git a/metadata/md5-cache/net-mail/vqadmin-2.3.6 b/metadata/md5-cache/net-mail/vqadmin-2.3.6
deleted file mode 100644
index d6e1680f1238..000000000000
--- a/metadata/md5-cache/net-mail/vqadmin-2.3.6
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install setup
-DEPEND=>=net-mail/vpopmail-5.3 virtual/qmail =www-servers/apache-2*
-DESCRIPTION=A web based control pannel to manage Virtual Qmail Domains. Works with qmailadmin
-EAPI=0
-HOMEPAGE=http://www.inter7.com/vqadmin
-KEYWORDS=~x86 ~ppc ~sparc
-LICENSE=GPL-2
-RDEPEND=>=net-mail/vpopmail-5.3 virtual/qmail net-mail/qmailadmin =www-servers/apache-2*
-SLOT=0
-SRC_URI=mirror://sourceforge/vqadmin/vqadmin-2.3.6.tar.gz
-_eclasses_=depend.apache	e3c541cb90838388f81620d630c28f41	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb
-_md5_=953b066d6311c977924f6d150638d656
diff --git a/metadata/md5-cache/net-mail/yosucker-75 b/metadata/md5-cache/net-mail/yosucker-75
deleted file mode 100644
index bc94f2450f60..000000000000
--- a/metadata/md5-cache/net-mail/yosucker-75
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst
-DEPEND=dev-lang/perl dev-perl/TermReadKey virtual/perl-Digest-MD5 dev-perl/IO-Socket-SSL virtual/perl-MIME-Base64
-DESCRIPTION=Downloads mail from a Yahoo! webmail account to a local mail spool, an mbox file, or to procmail
-EAPI=0
-HOMEPAGE=http://yosucker.sourceforge.net
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://sourceforge/yosucker/YoSucker-pr75.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb
-_md5_=33c3b7d695e1369409fd74334b9bb208
diff --git a/metadata/md5-cache/net-misc/stunnel-5.24 b/metadata/md5-cache/net-misc/stunnel-5.24
index 84dbb415d64f..481054748b96 100644
--- a/metadata/md5-cache/net-misc/stunnel-5.24
+++ b/metadata/md5-cache/net-misc/stunnel-5.24
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=tcpd? ( sys-apps/tcp-wrappers ) dev-libs/openssl:0 ssl? ( dev-libs/openssl:0= ) virtual/pkgconfig
+DEPEND=tcpd? ( sys-apps/tcp-wrappers ) dev-libs/openssl:0 ssl? ( dev-libs/openssl:0 ) virtual/pkgconfig
 DESCRIPTION=TLS/SSL - Port Wrapper
 EAPI=5
 HOMEPAGE=http://www.stunnel.org/index.html
@@ -10,5 +10,5 @@ RDEPEND=tcpd? ( sys-apps/tcp-wrappers ) dev-libs/openssl:0 stunnel3? ( dev-lang/
 RESTRICT=test
 SLOT=0
 SRC_URI=ftp://ftp.stunnel.org/stunnel/archive/5.x/stunnel-5.24.tar.gz http://www.usenix.org.uk/mirrors/stunnel/archive/5.x/stunnel-5.24.tar.gz http://ftp.nluug.nl/pub/networking/stunnel/archive/5.x/stunnel-5.24.tar.gz http://www.namesdir.com/mirrors/stunnel/archive/5.x/stunnel-5.24.tar.gz http://stunnel.cybermirror.org/archive/5.x/stunnel-5.24.tar.gz http://mirrors.zerg.biz/stunnel/archive/5.x/stunnel-5.24.tar.gz ftp://mirrors.go-parts.com/stunnel/archive/5.x/stunnel-5.24.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	multilib	23ae8c186171e6476af098d2a50d0ee0	ssl-cert	b29ef3f715f3a76f1bf807b7e8751096	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	user	906f3c8eb3a2350a4f1191a89baa3e46
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	multilib	23ae8c186171e6476af098d2a50d0ee0	ssl-cert	6f7d720c036362122b0bfb4461e56a11	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	user	906f3c8eb3a2350a4f1191a89baa3e46
 _md5_=ef8ded36e7d8dcbec0196750b33b3df2
diff --git a/metadata/md5-cache/net-misc/stunnel-5.29 b/metadata/md5-cache/net-misc/stunnel-5.29
index c21adebdc305..c3d90e92569a 100644
--- a/metadata/md5-cache/net-misc/stunnel-5.29
+++ b/metadata/md5-cache/net-misc/stunnel-5.29
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=tcpd? ( sys-apps/tcp-wrappers ) !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ssl? ( dev-libs/openssl:0= ) virtual/pkgconfig
+DEPEND=tcpd? ( sys-apps/tcp-wrappers ) !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ssl? ( dev-libs/openssl:0 ) virtual/pkgconfig
 DESCRIPTION=TLS/SSL - Port Wrapper
 EAPI=5
 HOMEPAGE=http://www.stunnel.org/index.html
@@ -10,5 +10,5 @@ RDEPEND=tcpd? ( sys-apps/tcp-wrappers ) !libressl? ( dev-libs/openssl:0 ) libres
 RESTRICT=test
 SLOT=0
 SRC_URI=ftp://ftp.stunnel.org/stunnel/archive/5.x/stunnel-5.29.tar.gz http://www.usenix.org.uk/mirrors/stunnel/archive/5.x/stunnel-5.29.tar.gz http://ftp.nluug.nl/pub/networking/stunnel/archive/5.x/stunnel-5.29.tar.gz http://www.namesdir.com/mirrors/stunnel/archive/5.x/stunnel-5.29.tar.gz http://stunnel.cybermirror.org/archive/5.x/stunnel-5.29.tar.gz http://mirrors.zerg.biz/stunnel/archive/5.x/stunnel-5.29.tar.gz ftp://mirrors.go-parts.com/stunnel/archive/5.x/stunnel-5.29.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	multilib	23ae8c186171e6476af098d2a50d0ee0	ssl-cert	b29ef3f715f3a76f1bf807b7e8751096	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	user	906f3c8eb3a2350a4f1191a89baa3e46
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	multilib	23ae8c186171e6476af098d2a50d0ee0	ssl-cert	6f7d720c036362122b0bfb4461e56a11	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	user	906f3c8eb3a2350a4f1191a89baa3e46
 _md5_=ec07b0079a4968f86598012208030b40
diff --git a/metadata/md5-cache/net-misc/stunnel-5.30 b/metadata/md5-cache/net-misc/stunnel-5.30
index ded6d9be22a6..275fa22bf242 100644
--- a/metadata/md5-cache/net-misc/stunnel-5.30
+++ b/metadata/md5-cache/net-misc/stunnel-5.30
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=tcpd? ( sys-apps/tcp-wrappers ) !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ssl? ( dev-libs/openssl:0= ) virtual/pkgconfig
+DEPEND=tcpd? ( sys-apps/tcp-wrappers ) !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ssl? ( dev-libs/openssl:0 ) virtual/pkgconfig
 DESCRIPTION=TLS/SSL - Port Wrapper
 EAPI=5
 HOMEPAGE=http://www.stunnel.org/index.html
@@ -10,5 +10,5 @@ RDEPEND=tcpd? ( sys-apps/tcp-wrappers ) !libressl? ( dev-libs/openssl:0 ) libres
 RESTRICT=test
 SLOT=0
 SRC_URI=ftp://ftp.stunnel.org/stunnel/archive/5.x/stunnel-5.30.tar.gz http://www.usenix.org.uk/mirrors/stunnel/archive/5.x/stunnel-5.30.tar.gz http://ftp.nluug.nl/pub/networking/stunnel/archive/5.x/stunnel-5.30.tar.gz http://www.namesdir.com/mirrors/stunnel/archive/5.x/stunnel-5.30.tar.gz http://stunnel.cybermirror.org/archive/5.x/stunnel-5.30.tar.gz http://mirrors.zerg.biz/stunnel/archive/5.x/stunnel-5.30.tar.gz ftp://mirrors.go-parts.com/stunnel/archive/5.x/stunnel-5.30.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	multilib	23ae8c186171e6476af098d2a50d0ee0	ssl-cert	b29ef3f715f3a76f1bf807b7e8751096	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	user	906f3c8eb3a2350a4f1191a89baa3e46
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	multilib	23ae8c186171e6476af098d2a50d0ee0	ssl-cert	6f7d720c036362122b0bfb4461e56a11	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	user	906f3c8eb3a2350a4f1191a89baa3e46
 _md5_=c8c90a404e7954eccc40a0f6622549e9
diff --git a/metadata/md5-cache/net-misc/stunnel-5.31 b/metadata/md5-cache/net-misc/stunnel-5.31
index b6fd37b0cc28..055b0a648034 100644
--- a/metadata/md5-cache/net-misc/stunnel-5.31
+++ b/metadata/md5-cache/net-misc/stunnel-5.31
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=tcpd? ( sys-apps/tcp-wrappers ) !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ssl? ( dev-libs/openssl:0= ) virtual/pkgconfig
+DEPEND=tcpd? ( sys-apps/tcp-wrappers ) !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ssl? ( dev-libs/openssl:0 ) virtual/pkgconfig
 DESCRIPTION=TLS/SSL - Port Wrapper
 EAPI=5
 HOMEPAGE=http://www.stunnel.org/index.html
@@ -10,5 +10,5 @@ RDEPEND=tcpd? ( sys-apps/tcp-wrappers ) !libressl? ( dev-libs/openssl:0 ) libres
 RESTRICT=test
 SLOT=0
 SRC_URI=ftp://ftp.stunnel.org/stunnel/archive/5.x/stunnel-5.31.tar.gz http://www.usenix.org.uk/mirrors/stunnel/archive/5.x/stunnel-5.31.tar.gz http://ftp.nluug.nl/pub/networking/stunnel/archive/5.x/stunnel-5.31.tar.gz http://www.namesdir.com/mirrors/stunnel/archive/5.x/stunnel-5.31.tar.gz http://stunnel.cybermirror.org/archive/5.x/stunnel-5.31.tar.gz http://mirrors.zerg.biz/stunnel/archive/5.x/stunnel-5.31.tar.gz ftp://mirrors.go-parts.com/stunnel/archive/5.x/stunnel-5.31.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	multilib	23ae8c186171e6476af098d2a50d0ee0	ssl-cert	b29ef3f715f3a76f1bf807b7e8751096	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	user	906f3c8eb3a2350a4f1191a89baa3e46
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	multilib	23ae8c186171e6476af098d2a50d0ee0	ssl-cert	6f7d720c036362122b0bfb4461e56a11	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	user	906f3c8eb3a2350a4f1191a89baa3e46
 _md5_=ec07b0079a4968f86598012208030b40
diff --git a/metadata/md5-cache/net-nds/openldap-2.3.43-r3 b/metadata/md5-cache/net-nds/openldap-2.3.43-r3
index e75d7f723402..b789ce2cea9f 100644
--- a/metadata/md5-cache/net-nds/openldap-2.3.43-r3
+++ b/metadata/md5-cache/net-nds/openldap-2.3.43-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup test
-DEPEND=sys-libs/ncurses tcpd? ( sys-apps/tcp-wrappers ) ssl? ( dev-libs/openssl ) sasl? ( dev-libs/cyrus-sasl ) !minimal? ( odbc? ( dev-db/unixODBC ) slp? ( net-libs/openslp ) perl? ( || ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] ) ) samba? ( dev-libs/openssl ) kerberos? ( virtual/krb5 ) berkdb? ( || ( sys-libs/db:4.5 sys-libs/db:4.4 sys-libs/db:4.3 >=sys-libs/db-4.2.52_p2-r1:4.2 ) ) !berkdb? ( gdbm? ( sys-libs/gdbm ) !gdbm? ( || ( sys-libs/db:4.5 sys-libs/db:4.4 sys-libs/db:4.3 >=sys-libs/db-4.2.52_p2-r1:4.2 ) ) ) smbkrb5passwd? ( dev-libs/openssl app-crypt/heimdal ) ) selinux? ( sec-policy/selinux-ldap ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ssl? ( dev-libs/openssl:0= )
+DEPEND=sys-libs/ncurses tcpd? ( sys-apps/tcp-wrappers ) ssl? ( dev-libs/openssl ) sasl? ( dev-libs/cyrus-sasl ) !minimal? ( odbc? ( dev-db/unixODBC ) slp? ( net-libs/openslp ) perl? ( || ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] ) ) samba? ( dev-libs/openssl ) kerberos? ( virtual/krb5 ) berkdb? ( || ( sys-libs/db:4.5 sys-libs/db:4.4 sys-libs/db:4.3 >=sys-libs/db-4.2.52_p2-r1:4.2 ) ) !berkdb? ( gdbm? ( sys-libs/gdbm ) !gdbm? ( || ( sys-libs/db:4.5 sys-libs/db:4.4 sys-libs/db:4.3 >=sys-libs/db-4.2.52_p2-r1:4.2 ) ) ) smbkrb5passwd? ( dev-libs/openssl app-crypt/heimdal ) ) selinux? ( sec-policy/selinux-ldap ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ssl? ( dev-libs/openssl:0 )
 DESCRIPTION=LDAP suite of application and development tools
 EAPI=2
 HOMEPAGE=http://www.OpenLDAP.org/
@@ -9,5 +9,5 @@ LICENSE=OPENLDAP GPL-2
 RDEPEND=sys-libs/ncurses tcpd? ( sys-apps/tcp-wrappers ) ssl? ( dev-libs/openssl ) sasl? ( dev-libs/cyrus-sasl ) !minimal? ( odbc? ( dev-db/unixODBC ) slp? ( net-libs/openslp ) perl? ( || ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] ) ) samba? ( dev-libs/openssl ) kerberos? ( virtual/krb5 ) berkdb? ( || ( sys-libs/db:4.5 sys-libs/db:4.4 sys-libs/db:4.3 >=sys-libs/db-4.2.52_p2-r1:4.2 ) ) !berkdb? ( gdbm? ( sys-libs/gdbm ) !gdbm? ( || ( sys-libs/db:4.5 sys-libs/db:4.4 sys-libs/db:4.3 >=sys-libs/db-4.2.52_p2-r1:4.2 ) ) ) smbkrb5passwd? ( dev-libs/openssl app-crypt/heimdal ) ) selinux? ( sec-policy/selinux-ldap )
 SLOT=0
 SRC_URI=mirror://openldap/openldap-release/openldap-2.3.43.tgz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	db-use	a4966c7f4f7df444ead1212848c13cc9	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	libtool	4890219c51da247200223277f993e054	multilib	23ae8c186171e6476af098d2a50d0ee0	ssl-cert	b29ef3f715f3a76f1bf807b7e8751096	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	db-use	a4966c7f4f7df444ead1212848c13cc9	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	libtool	4890219c51da247200223277f993e054	multilib	23ae8c186171e6476af098d2a50d0ee0	ssl-cert	6f7d720c036362122b0bfb4461e56a11	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b5b8ddd4d2a8ed6a2e5b93e7bcc95bb6
diff --git a/metadata/md5-cache/net-nds/openldap-2.3.43-r4 b/metadata/md5-cache/net-nds/openldap-2.3.43-r4
index bac451f38872..ffc40bfb0b80 100644
--- a/metadata/md5-cache/net-nds/openldap-2.3.43-r4
+++ b/metadata/md5-cache/net-nds/openldap-2.3.43-r4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup test
-DEPEND=sys-libs/ncurses tcpd? ( sys-apps/tcp-wrappers ) ssl? ( dev-libs/openssl ) sasl? ( dev-libs/cyrus-sasl ) !minimal? ( odbc? ( dev-db/unixODBC ) slp? ( net-libs/openslp ) perl? ( || ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] ) ) samba? ( dev-libs/openssl ) kerberos? ( virtual/krb5 ) berkdb? ( || ( sys-libs/db:4.5 sys-libs/db:4.4 sys-libs/db:4.3 >=sys-libs/db-4.2.52_p2-r1:4.2 ) ) !berkdb? ( gdbm? ( sys-libs/gdbm ) !gdbm? ( || ( sys-libs/db:4.5 sys-libs/db:4.4 sys-libs/db:4.3 >=sys-libs/db-4.2.52_p2-r1:4.2 ) ) ) smbkrb5passwd? ( dev-libs/openssl app-crypt/heimdal ) ) selinux? ( sec-policy/selinux-ldap ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ssl? ( dev-libs/openssl:0= )
+DEPEND=sys-libs/ncurses tcpd? ( sys-apps/tcp-wrappers ) ssl? ( dev-libs/openssl ) sasl? ( dev-libs/cyrus-sasl ) !minimal? ( odbc? ( dev-db/unixODBC ) slp? ( net-libs/openslp ) perl? ( || ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] ) ) samba? ( dev-libs/openssl ) kerberos? ( virtual/krb5 ) berkdb? ( || ( sys-libs/db:4.5 sys-libs/db:4.4 sys-libs/db:4.3 >=sys-libs/db-4.2.52_p2-r1:4.2 ) ) !berkdb? ( gdbm? ( sys-libs/gdbm ) !gdbm? ( || ( sys-libs/db:4.5 sys-libs/db:4.4 sys-libs/db:4.3 >=sys-libs/db-4.2.52_p2-r1:4.2 ) ) ) smbkrb5passwd? ( dev-libs/openssl app-crypt/heimdal ) ) selinux? ( sec-policy/selinux-ldap ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ssl? ( dev-libs/openssl:0 )
 DESCRIPTION=LDAP suite of application and development tools
 EAPI=2
 HOMEPAGE=http://www.OpenLDAP.org/
@@ -9,5 +9,5 @@ LICENSE=OPENLDAP GPL-2
 RDEPEND=sys-libs/ncurses tcpd? ( sys-apps/tcp-wrappers ) ssl? ( dev-libs/openssl ) sasl? ( dev-libs/cyrus-sasl ) !minimal? ( odbc? ( dev-db/unixODBC ) slp? ( net-libs/openslp ) perl? ( || ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] ) ) samba? ( dev-libs/openssl ) kerberos? ( virtual/krb5 ) berkdb? ( || ( sys-libs/db:4.5 sys-libs/db:4.4 sys-libs/db:4.3 >=sys-libs/db-4.2.52_p2-r1:4.2 ) ) !berkdb? ( gdbm? ( sys-libs/gdbm ) !gdbm? ( || ( sys-libs/db:4.5 sys-libs/db:4.4 sys-libs/db:4.3 >=sys-libs/db-4.2.52_p2-r1:4.2 ) ) ) smbkrb5passwd? ( dev-libs/openssl app-crypt/heimdal ) ) selinux? ( sec-policy/selinux-ldap )
 SLOT=0
 SRC_URI=mirror://openldap/openldap-release/openldap-2.3.43.tgz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	db-use	a4966c7f4f7df444ead1212848c13cc9	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	libtool	4890219c51da247200223277f993e054	multilib	23ae8c186171e6476af098d2a50d0ee0	ssl-cert	b29ef3f715f3a76f1bf807b7e8751096	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	db-use	a4966c7f4f7df444ead1212848c13cc9	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	libtool	4890219c51da247200223277f993e054	multilib	23ae8c186171e6476af098d2a50d0ee0	ssl-cert	6f7d720c036362122b0bfb4461e56a11	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=176062222ef64c7498c74c1a4fc10005
diff --git a/metadata/md5-cache/net-nds/openldap-2.4.38-r2 b/metadata/md5-cache/net-nds/openldap-2.4.38-r2
index 787b9df0f664..ca065599901c 100644
--- a/metadata/md5-cache/net-nds/openldap-2.4.38-r2
+++ b/metadata/md5-cache/net-nds/openldap-2.4.38-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup test
-DEPEND=icu? ( dev-libs/icu:= ) ssl? ( !gnutls? ( >=dev-libs/openssl-1.0.1h-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gnutls? ( >=net-libs/gnutls-2.12.23-r6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libgcrypt-1.5.3:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) sasl? ( dev-libs/cyrus-sasl:= ) !minimal? ( sys-devel/libtool tcpd? ( sys-apps/tcp-wrappers ) odbc? ( !iodbc? ( dev-db/unixODBC ) iodbc? ( dev-db/libiodbc ) ) slp? ( net-libs/openslp ) perl? ( dev-lang/perl[-build(-)] ) samba? ( dev-libs/openssl ) berkdb? ( sys-libs/db ) smbkrb5passwd? ( dev-libs/openssl app-crypt/heimdal ) kerberos? ( virtual/krb5 ) cxx? ( dev-libs/cyrus-sasl:= ) ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508-r3 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) sys-apps/groff ssl? ( dev-libs/openssl:0= ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEPEND=icu? ( dev-libs/icu:= ) ssl? ( !gnutls? ( >=dev-libs/openssl-1.0.1h-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gnutls? ( >=net-libs/gnutls-2.12.23-r6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libgcrypt-1.5.3:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) sasl? ( dev-libs/cyrus-sasl:= ) !minimal? ( sys-devel/libtool tcpd? ( sys-apps/tcp-wrappers ) odbc? ( !iodbc? ( dev-db/unixODBC ) iodbc? ( dev-db/libiodbc ) ) slp? ( net-libs/openslp ) perl? ( dev-lang/perl[-build(-)] ) samba? ( dev-libs/openssl ) berkdb? ( sys-libs/db ) smbkrb5passwd? ( dev-libs/openssl app-crypt/heimdal ) kerberos? ( virtual/krb5 ) cxx? ( dev-libs/cyrus-sasl:= ) ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508-r3 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) sys-apps/groff ssl? ( dev-libs/openssl:0 ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
 DESCRIPTION=LDAP suite of application and development tools
 EAPI=5
 HOMEPAGE=http://www.OpenLDAP.org/
@@ -10,5 +10,5 @@ RDEPEND=icu? ( dev-libs/icu:= ) ssl? ( !gnutls? ( >=dev-libs/openssl-1.0.1h-r2[a
 REQUIRED_USE=cxx? ( sasl )
 SLOT=0
 SRC_URI=ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/openldap-2.4.38.tgz mirror://gentoo/rfc2307bis.schema-20140524
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	db-use	a4966c7f4f7df444ead1212848c13cc9	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	23ae8c186171e6476af098d2a50d0ee0	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	ssl-cert	b29ef3f715f3a76f1bf807b7e8751096	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	db-use	a4966c7f4f7df444ead1212848c13cc9	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	23ae8c186171e6476af098d2a50d0ee0	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	ssl-cert	6f7d720c036362122b0bfb4461e56a11	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=989249308fcb205359763ad5fb6c4dcb
diff --git a/metadata/md5-cache/net-nds/openldap-2.4.39 b/metadata/md5-cache/net-nds/openldap-2.4.39
index 697595d0a1f5..8da8080cbd4b 100644
--- a/metadata/md5-cache/net-nds/openldap-2.4.39
+++ b/metadata/md5-cache/net-nds/openldap-2.4.39
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup test
-DEPEND=icu? ( dev-libs/icu:= ) ssl? ( !gnutls? ( >=dev-libs/openssl-1.0.1h-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gnutls? ( >=net-libs/gnutls-2.12.23-r6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libgcrypt-1.5.3:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) sasl? ( dev-libs/cyrus-sasl:= ) !minimal? ( sys-devel/libtool tcpd? ( sys-apps/tcp-wrappers ) odbc? ( !iodbc? ( dev-db/unixODBC ) iodbc? ( dev-db/libiodbc ) ) slp? ( net-libs/openslp ) perl? ( dev-lang/perl[-build(-)] ) samba? ( dev-libs/openssl ) berkdb? ( sys-libs/db ) smbkrb5passwd? ( dev-libs/openssl app-crypt/heimdal ) kerberos? ( virtual/krb5 ) cxx? ( dev-libs/cyrus-sasl:= ) ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508-r3 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) sys-apps/groff ssl? ( dev-libs/openssl:0= ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEPEND=icu? ( dev-libs/icu:= ) ssl? ( !gnutls? ( >=dev-libs/openssl-1.0.1h-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gnutls? ( >=net-libs/gnutls-2.12.23-r6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libgcrypt-1.5.3:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) sasl? ( dev-libs/cyrus-sasl:= ) !minimal? ( sys-devel/libtool tcpd? ( sys-apps/tcp-wrappers ) odbc? ( !iodbc? ( dev-db/unixODBC ) iodbc? ( dev-db/libiodbc ) ) slp? ( net-libs/openslp ) perl? ( dev-lang/perl[-build(-)] ) samba? ( dev-libs/openssl ) berkdb? ( sys-libs/db ) smbkrb5passwd? ( dev-libs/openssl app-crypt/heimdal ) kerberos? ( virtual/krb5 ) cxx? ( dev-libs/cyrus-sasl:= ) ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508-r3 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) sys-apps/groff ssl? ( dev-libs/openssl:0 ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
 DESCRIPTION=LDAP suite of application and development tools
 EAPI=5
 HOMEPAGE=http://www.OpenLDAP.org/
@@ -10,5 +10,5 @@ RDEPEND=icu? ( dev-libs/icu:= ) ssl? ( !gnutls? ( >=dev-libs/openssl-1.0.1h-r2[a
 REQUIRED_USE=cxx? ( sasl )
 SLOT=0
 SRC_URI=ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/openldap-2.4.39.tgz mirror://gentoo/rfc2307bis.schema-20140524
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	db-use	a4966c7f4f7df444ead1212848c13cc9	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	23ae8c186171e6476af098d2a50d0ee0	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	ssl-cert	b29ef3f715f3a76f1bf807b7e8751096	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	db-use	a4966c7f4f7df444ead1212848c13cc9	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	23ae8c186171e6476af098d2a50d0ee0	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	ssl-cert	6f7d720c036362122b0bfb4461e56a11	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c080335e0763853ef30606a694130dc5
diff --git a/metadata/md5-cache/net-nds/openldap-2.4.40 b/metadata/md5-cache/net-nds/openldap-2.4.40
index 9304ce043e1f..198b6a81a516 100644
--- a/metadata/md5-cache/net-nds/openldap-2.4.40
+++ b/metadata/md5-cache/net-nds/openldap-2.4.40
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup test
-DEPEND=icu? ( dev-libs/icu:= ) ssl? ( !gnutls? ( >=dev-libs/openssl-1.0.1h-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gnutls? ( >=net-libs/gnutls-2.12.23-r6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libgcrypt-1.5.3:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) sasl? ( dev-libs/cyrus-sasl:= ) !minimal? ( sys-devel/libtool sys-libs/e2fsprogs-libs tcpd? ( sys-apps/tcp-wrappers ) odbc? ( !iodbc? ( dev-db/unixODBC ) iodbc? ( dev-db/libiodbc ) ) slp? ( net-libs/openslp ) perl? ( dev-lang/perl[-build(-)] ) samba? ( dev-libs/openssl ) berkdb? ( sys-libs/db ) smbkrb5passwd? ( dev-libs/openssl kerberos? ( app-crypt/heimdal ) ) kerberos? ( virtual/krb5 ) cxx? ( dev-libs/cyrus-sasl:= ) ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508-r3 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) sys-apps/groff ssl? ( dev-libs/openssl:0= ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEPEND=icu? ( dev-libs/icu:= ) ssl? ( !gnutls? ( >=dev-libs/openssl-1.0.1h-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gnutls? ( >=net-libs/gnutls-2.12.23-r6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libgcrypt-1.5.3:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) sasl? ( dev-libs/cyrus-sasl:= ) !minimal? ( sys-devel/libtool sys-libs/e2fsprogs-libs tcpd? ( sys-apps/tcp-wrappers ) odbc? ( !iodbc? ( dev-db/unixODBC ) iodbc? ( dev-db/libiodbc ) ) slp? ( net-libs/openslp ) perl? ( dev-lang/perl[-build(-)] ) samba? ( dev-libs/openssl ) berkdb? ( sys-libs/db ) smbkrb5passwd? ( dev-libs/openssl kerberos? ( app-crypt/heimdal ) ) kerberos? ( virtual/krb5 ) cxx? ( dev-libs/cyrus-sasl:= ) ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508-r3 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) sys-apps/groff ssl? ( dev-libs/openssl:0 ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
 DESCRIPTION=LDAP suite of application and development tools
 EAPI=5
 HOMEPAGE=http://www.OpenLDAP.org/
@@ -10,5 +10,5 @@ RDEPEND=icu? ( dev-libs/icu:= ) ssl? ( !gnutls? ( >=dev-libs/openssl-1.0.1h-r2[a
 REQUIRED_USE=cxx? ( sasl )
 SLOT=0
 SRC_URI=ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/openldap-2.4.40.tgz mirror://gentoo/rfc2307bis.schema-20140524
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	db-use	a4966c7f4f7df444ead1212848c13cc9	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	23ae8c186171e6476af098d2a50d0ee0	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	ssl-cert	b29ef3f715f3a76f1bf807b7e8751096	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	db-use	a4966c7f4f7df444ead1212848c13cc9	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	23ae8c186171e6476af098d2a50d0ee0	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	ssl-cert	6f7d720c036362122b0bfb4461e56a11	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=7e66e7e2c7b1eaffbfbbf234b962ca5a
diff --git a/metadata/md5-cache/net-nds/openldap-2.4.40-r2 b/metadata/md5-cache/net-nds/openldap-2.4.40-r2
index 368eac934700..1d0b0ffd0f76 100644
--- a/metadata/md5-cache/net-nds/openldap-2.4.40-r2
+++ b/metadata/md5-cache/net-nds/openldap-2.4.40-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup test
-DEPEND=icu? ( dev-libs/icu:= ) ssl? ( !gnutls? ( >=dev-libs/openssl-1.0.1h-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gnutls? ( >=net-libs/gnutls-2.12.23-r6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libgcrypt-1.5.3:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) sasl? ( dev-libs/cyrus-sasl:= ) !minimal? ( sys-devel/libtool sys-libs/e2fsprogs-libs >=dev-db/lmdb-0.9.14 tcpd? ( sys-apps/tcp-wrappers ) odbc? ( !iodbc? ( dev-db/unixODBC ) iodbc? ( dev-db/libiodbc ) ) slp? ( net-libs/openslp ) perl? ( dev-lang/perl[-build(-)] ) samba? ( dev-libs/openssl ) berkdb? ( <sys-libs/db-6.0:= || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 sys-libs/db:4.4 ) ) smbkrb5passwd? ( dev-libs/openssl kerberos? ( app-crypt/heimdal ) ) kerberos? ( virtual/krb5 ) cxx? ( dev-libs/cyrus-sasl:= ) ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508-r3 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) sys-apps/groff ssl? ( dev-libs/openssl:0= ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEPEND=icu? ( dev-libs/icu:= ) ssl? ( !gnutls? ( >=dev-libs/openssl-1.0.1h-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gnutls? ( >=net-libs/gnutls-2.12.23-r6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libgcrypt-1.5.3:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) sasl? ( dev-libs/cyrus-sasl:= ) !minimal? ( sys-devel/libtool sys-libs/e2fsprogs-libs >=dev-db/lmdb-0.9.14 tcpd? ( sys-apps/tcp-wrappers ) odbc? ( !iodbc? ( dev-db/unixODBC ) iodbc? ( dev-db/libiodbc ) ) slp? ( net-libs/openslp ) perl? ( dev-lang/perl[-build(-)] ) samba? ( dev-libs/openssl ) berkdb? ( <sys-libs/db-6.0:= || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 sys-libs/db:4.4 ) ) smbkrb5passwd? ( dev-libs/openssl kerberos? ( app-crypt/heimdal ) ) kerberos? ( virtual/krb5 ) cxx? ( dev-libs/cyrus-sasl:= ) ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508-r3 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) sys-apps/groff ssl? ( dev-libs/openssl:0 ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
 DESCRIPTION=LDAP suite of application and development tools
 EAPI=5
 HOMEPAGE=http://www.OpenLDAP.org/
@@ -10,5 +10,5 @@ RDEPEND=icu? ( dev-libs/icu:= ) ssl? ( !gnutls? ( >=dev-libs/openssl-1.0.1h-r2[a
 REQUIRED_USE=cxx? ( sasl )
 SLOT=0
 SRC_URI=ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/openldap-2.4.40.tgz mirror://gentoo/rfc2307bis.schema-20140524
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	db-use	a4966c7f4f7df444ead1212848c13cc9	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	23ae8c186171e6476af098d2a50d0ee0	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	ssl-cert	b29ef3f715f3a76f1bf807b7e8751096	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	db-use	a4966c7f4f7df444ead1212848c13cc9	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	23ae8c186171e6476af098d2a50d0ee0	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	ssl-cert	6f7d720c036362122b0bfb4461e56a11	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9221049c651849d69ec1369c4d40e224
diff --git a/metadata/md5-cache/net-nds/openldap-2.4.40-r4 b/metadata/md5-cache/net-nds/openldap-2.4.40-r4
index 3cb06a1b9454..14d9ab741006 100644
--- a/metadata/md5-cache/net-nds/openldap-2.4.40-r4
+++ b/metadata/md5-cache/net-nds/openldap-2.4.40-r4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup test
-DEPEND=icu? ( dev-libs/icu:= ) ssl? ( !gnutls? ( >=dev-libs/openssl-1.0.1h-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gnutls? ( >=net-libs/gnutls-2.12.23-r6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libgcrypt-1.5.3:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) sasl? ( dev-libs/cyrus-sasl:= ) !minimal? ( sys-devel/libtool sys-libs/e2fsprogs-libs >=dev-db/lmdb-0.9.14 tcpd? ( sys-apps/tcp-wrappers ) odbc? ( !iodbc? ( dev-db/unixODBC ) iodbc? ( dev-db/libiodbc ) ) slp? ( net-libs/openslp ) perl? ( dev-lang/perl[-build(-)] ) samba? ( dev-libs/openssl ) berkdb? ( <sys-libs/db-6.0:= || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 sys-libs/db:4.4 ) ) smbkrb5passwd? ( dev-libs/openssl kerberos? ( app-crypt/heimdal ) ) kerberos? ( virtual/krb5 ) cxx? ( dev-libs/cyrus-sasl:= ) ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508-r3 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) sys-apps/groff ssl? ( dev-libs/openssl:0= ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEPEND=icu? ( dev-libs/icu:= ) ssl? ( !gnutls? ( >=dev-libs/openssl-1.0.1h-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gnutls? ( >=net-libs/gnutls-2.12.23-r6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libgcrypt-1.5.3:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) sasl? ( dev-libs/cyrus-sasl:= ) !minimal? ( sys-devel/libtool sys-libs/e2fsprogs-libs >=dev-db/lmdb-0.9.14 tcpd? ( sys-apps/tcp-wrappers ) odbc? ( !iodbc? ( dev-db/unixODBC ) iodbc? ( dev-db/libiodbc ) ) slp? ( net-libs/openslp ) perl? ( dev-lang/perl[-build(-)] ) samba? ( dev-libs/openssl ) berkdb? ( <sys-libs/db-6.0:= || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 sys-libs/db:4.4 ) ) smbkrb5passwd? ( dev-libs/openssl kerberos? ( app-crypt/heimdal ) ) kerberos? ( virtual/krb5 ) cxx? ( dev-libs/cyrus-sasl:= ) ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508-r3 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) sys-apps/groff ssl? ( dev-libs/openssl:0 ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
 DESCRIPTION=LDAP suite of application and development tools
 EAPI=5
 HOMEPAGE=http://www.OpenLDAP.org/
@@ -10,5 +10,5 @@ RDEPEND=icu? ( dev-libs/icu:= ) ssl? ( !gnutls? ( >=dev-libs/openssl-1.0.1h-r2[a
 REQUIRED_USE=cxx? ( sasl )
 SLOT=0
 SRC_URI=ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/openldap-2.4.40.tgz mirror://gentoo/rfc2307bis.schema-20140524
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	db-use	a4966c7f4f7df444ead1212848c13cc9	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	23ae8c186171e6476af098d2a50d0ee0	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	ssl-cert	b29ef3f715f3a76f1bf807b7e8751096	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	db-use	a4966c7f4f7df444ead1212848c13cc9	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	23ae8c186171e6476af098d2a50d0ee0	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	ssl-cert	6f7d720c036362122b0bfb4461e56a11	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d7eb9a791d05b47ad4bae201bcd0cd8b
diff --git a/metadata/md5-cache/net-nds/openldap-2.4.42 b/metadata/md5-cache/net-nds/openldap-2.4.42
index f53071f3d8a2..aae46e352651 100644
--- a/metadata/md5-cache/net-nds/openldap-2.4.42
+++ b/metadata/md5-cache/net-nds/openldap-2.4.42
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup test
-DEPEND=icu? ( dev-libs/icu:= ) ssl? ( !gnutls? ( >=dev-libs/openssl-1.0.1h-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gnutls? ( >=net-libs/gnutls-2.12.23-r6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libgcrypt-1.5.3:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) sasl? ( dev-libs/cyrus-sasl:= ) !minimal? ( sys-devel/libtool sys-libs/e2fsprogs-libs >=dev-db/lmdb-0.9.14 tcpd? ( sys-apps/tcp-wrappers ) odbc? ( !iodbc? ( dev-db/unixODBC ) iodbc? ( dev-db/libiodbc ) ) slp? ( net-libs/openslp ) perl? ( dev-lang/perl[-build(-)] ) samba? ( dev-libs/openssl ) berkdb? ( <sys-libs/db-6.0:= || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 sys-libs/db:4.4 ) ) smbkrb5passwd? ( dev-libs/openssl kerberos? ( app-crypt/heimdal ) ) kerberos? ( virtual/krb5 ) cxx? ( dev-libs/cyrus-sasl:= ) ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508-r3 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) sys-apps/groff ssl? ( dev-libs/openssl:0= ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEPEND=icu? ( dev-libs/icu:= ) ssl? ( !gnutls? ( >=dev-libs/openssl-1.0.1h-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gnutls? ( >=net-libs/gnutls-2.12.23-r6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libgcrypt-1.5.3:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) sasl? ( dev-libs/cyrus-sasl:= ) !minimal? ( sys-devel/libtool sys-libs/e2fsprogs-libs >=dev-db/lmdb-0.9.14 tcpd? ( sys-apps/tcp-wrappers ) odbc? ( !iodbc? ( dev-db/unixODBC ) iodbc? ( dev-db/libiodbc ) ) slp? ( net-libs/openslp ) perl? ( dev-lang/perl[-build(-)] ) samba? ( dev-libs/openssl ) berkdb? ( <sys-libs/db-6.0:= || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 sys-libs/db:4.4 ) ) smbkrb5passwd? ( dev-libs/openssl kerberos? ( app-crypt/heimdal ) ) kerberos? ( virtual/krb5 ) cxx? ( dev-libs/cyrus-sasl:= ) ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508-r3 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) sys-apps/groff ssl? ( dev-libs/openssl:0 ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
 DESCRIPTION=LDAP suite of application and development tools
 EAPI=5
 HOMEPAGE=http://www.OpenLDAP.org/
@@ -10,5 +10,5 @@ RDEPEND=icu? ( dev-libs/icu:= ) ssl? ( !gnutls? ( >=dev-libs/openssl-1.0.1h-r2[a
 REQUIRED_USE=cxx? ( sasl )
 SLOT=0
 SRC_URI=ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/openldap-2.4.42.tgz mirror://gentoo/rfc2307bis.schema-20140524
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	db-use	a4966c7f4f7df444ead1212848c13cc9	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	23ae8c186171e6476af098d2a50d0ee0	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	ssl-cert	b29ef3f715f3a76f1bf807b7e8751096	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	db-use	a4966c7f4f7df444ead1212848c13cc9	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	23ae8c186171e6476af098d2a50d0ee0	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	ssl-cert	6f7d720c036362122b0bfb4461e56a11	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f2dcdd3fb181a5a4d42ea7deeb50b45c
diff --git a/metadata/md5-cache/net-nds/openldap-2.4.42-r1 b/metadata/md5-cache/net-nds/openldap-2.4.42-r1
index f825000f7b08..9001b41e7ec1 100644
--- a/metadata/md5-cache/net-nds/openldap-2.4.42-r1
+++ b/metadata/md5-cache/net-nds/openldap-2.4.42-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup test
-DEPEND=icu? ( dev-libs/icu:= ) ssl? ( !gnutls? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) gnutls? ( >=net-libs/gnutls-2.12.23-r6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] libressl? ( dev-libs/libressl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=dev-libs/libgcrypt-1.5.3:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) sasl? ( dev-libs/cyrus-sasl:= ) !minimal? ( sys-devel/libtool sys-libs/e2fsprogs-libs >=dev-db/lmdb-0.9.14 tcpd? ( sys-apps/tcp-wrappers ) odbc? ( !iodbc? ( dev-db/unixODBC ) iodbc? ( dev-db/libiodbc ) ) slp? ( net-libs/openslp ) perl? ( dev-lang/perl[-build(-)] ) samba? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) berkdb? ( <sys-libs/db-6.0:= || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 sys-libs/db:4.4 ) ) smbkrb5passwd? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) kerberos? ( app-crypt/heimdal ) ) kerberos? ( virtual/krb5 ) cxx? ( dev-libs/cyrus-sasl:= ) ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508-r3 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) sys-apps/groff ssl? ( dev-libs/openssl:0= ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEPEND=icu? ( dev-libs/icu:= ) ssl? ( !gnutls? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) gnutls? ( >=net-libs/gnutls-2.12.23-r6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] libressl? ( dev-libs/libressl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=dev-libs/libgcrypt-1.5.3:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) sasl? ( dev-libs/cyrus-sasl:= ) !minimal? ( sys-devel/libtool sys-libs/e2fsprogs-libs >=dev-db/lmdb-0.9.14 tcpd? ( sys-apps/tcp-wrappers ) odbc? ( !iodbc? ( dev-db/unixODBC ) iodbc? ( dev-db/libiodbc ) ) slp? ( net-libs/openslp ) perl? ( dev-lang/perl[-build(-)] ) samba? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) berkdb? ( <sys-libs/db-6.0:= || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 sys-libs/db:4.4 ) ) smbkrb5passwd? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) kerberos? ( app-crypt/heimdal ) ) kerberos? ( virtual/krb5 ) cxx? ( dev-libs/cyrus-sasl:= ) ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508-r3 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) sys-apps/groff ssl? ( dev-libs/openssl:0 ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
 DESCRIPTION=LDAP suite of application and development tools
 EAPI=5
 HOMEPAGE=http://www.OpenLDAP.org/
@@ -10,5 +10,5 @@ RDEPEND=icu? ( dev-libs/icu:= ) ssl? ( !gnutls? ( !libressl? ( >=dev-libs/openss
 REQUIRED_USE=cxx? ( sasl ) ?? ( gnutls libressl )
 SLOT=0
 SRC_URI=ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/openldap-2.4.42.tgz mirror://gentoo/rfc2307bis.schema-20140524
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	db-use	a4966c7f4f7df444ead1212848c13cc9	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	23ae8c186171e6476af098d2a50d0ee0	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	ssl-cert	b29ef3f715f3a76f1bf807b7e8751096	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	db-use	a4966c7f4f7df444ead1212848c13cc9	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	23ae8c186171e6476af098d2a50d0ee0	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	ssl-cert	6f7d720c036362122b0bfb4461e56a11	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=42671bb7c49e6de7577b52b8d6bac5b3
diff --git a/metadata/md5-cache/net-nds/openldap-2.4.43 b/metadata/md5-cache/net-nds/openldap-2.4.43
index d7f2abe277dd..281300f306f6 100644
--- a/metadata/md5-cache/net-nds/openldap-2.4.43
+++ b/metadata/md5-cache/net-nds/openldap-2.4.43
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup test
-DEPEND=icu? ( dev-libs/icu:= ) ssl? ( !gnutls? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) gnutls? ( >=net-libs/gnutls-2.12.23-r6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] libressl? ( dev-libs/libressl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=dev-libs/libgcrypt-1.5.3:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) sasl? ( dev-libs/cyrus-sasl:= ) !minimal? ( sys-devel/libtool sys-libs/e2fsprogs-libs >=dev-db/lmdb-0.9.14 tcpd? ( sys-apps/tcp-wrappers ) odbc? ( !iodbc? ( dev-db/unixODBC ) iodbc? ( dev-db/libiodbc ) ) slp? ( net-libs/openslp ) perl? ( dev-lang/perl[-build(-)] ) samba? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) berkdb? ( <sys-libs/db-6.0:= || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 sys-libs/db:4.4 ) ) smbkrb5passwd? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) kerberos? ( app-crypt/heimdal ) ) kerberos? ( virtual/krb5 ) cxx? ( dev-libs/cyrus-sasl:= ) ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508-r3 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) sys-apps/groff ssl? ( dev-libs/openssl:0= ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEPEND=icu? ( dev-libs/icu:= ) ssl? ( !gnutls? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) gnutls? ( >=net-libs/gnutls-2.12.23-r6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] libressl? ( dev-libs/libressl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=dev-libs/libgcrypt-1.5.3:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) sasl? ( dev-libs/cyrus-sasl:= ) !minimal? ( sys-devel/libtool sys-libs/e2fsprogs-libs >=dev-db/lmdb-0.9.14 tcpd? ( sys-apps/tcp-wrappers ) odbc? ( !iodbc? ( dev-db/unixODBC ) iodbc? ( dev-db/libiodbc ) ) slp? ( net-libs/openslp ) perl? ( dev-lang/perl[-build(-)] ) samba? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) berkdb? ( <sys-libs/db-6.0:= || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 sys-libs/db:4.4 ) ) smbkrb5passwd? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) kerberos? ( app-crypt/heimdal ) ) kerberos? ( virtual/krb5 ) cxx? ( dev-libs/cyrus-sasl:= ) ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508-r3 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) sys-apps/groff ssl? ( dev-libs/openssl:0 ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
 DESCRIPTION=LDAP suite of application and development tools
 EAPI=5
 HOMEPAGE=http://www.OpenLDAP.org/
@@ -10,5 +10,5 @@ RDEPEND=icu? ( dev-libs/icu:= ) ssl? ( !gnutls? ( !libressl? ( >=dev-libs/openss
 REQUIRED_USE=cxx? ( sasl ) ?? ( gnutls libressl )
 SLOT=0
 SRC_URI=ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/openldap-2.4.43.tgz mirror://gentoo/rfc2307bis.schema-20140524
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	db-use	a4966c7f4f7df444ead1212848c13cc9	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	23ae8c186171e6476af098d2a50d0ee0	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	ssl-cert	b29ef3f715f3a76f1bf807b7e8751096	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	db-use	a4966c7f4f7df444ead1212848c13cc9	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	23ae8c186171e6476af098d2a50d0ee0	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	ssl-cert	6f7d720c036362122b0bfb4461e56a11	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=30d2aa40922665be9bc6842d5f1c2a38
diff --git a/metadata/md5-cache/net-nds/openldap-2.4.43-r1 b/metadata/md5-cache/net-nds/openldap-2.4.43-r1
index cc3c77468e07..e6e0aafd042d 100644
--- a/metadata/md5-cache/net-nds/openldap-2.4.43-r1
+++ b/metadata/md5-cache/net-nds/openldap-2.4.43-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup test
-DEPEND=icu? ( dev-libs/icu:= ) ssl? ( !gnutls? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) gnutls? ( >=net-libs/gnutls-2.12.23-r6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] libressl? ( dev-libs/libressl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=dev-libs/libgcrypt-1.5.3:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) sasl? ( dev-libs/cyrus-sasl:= ) !minimal? ( sys-devel/libtool sys-libs/e2fsprogs-libs >=dev-db/lmdb-0.9.14 tcpd? ( sys-apps/tcp-wrappers ) odbc? ( !iodbc? ( dev-db/unixODBC ) iodbc? ( dev-db/libiodbc ) ) slp? ( net-libs/openslp ) perl? ( dev-lang/perl[-build(-)] ) samba? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) berkdb? ( <sys-libs/db-6.0:= || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 sys-libs/db:4.4 ) ) smbkrb5passwd? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) kerberos? ( app-crypt/heimdal ) ) kerberos? ( virtual/krb5 kinit? ( !app-crypt/heimdal ) ) cxx? ( dev-libs/cyrus-sasl:= ) ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508-r3 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) sys-apps/groff ssl? ( dev-libs/openssl:0= ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEPEND=icu? ( dev-libs/icu:= ) ssl? ( !gnutls? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) gnutls? ( >=net-libs/gnutls-2.12.23-r6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] libressl? ( dev-libs/libressl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=dev-libs/libgcrypt-1.5.3:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) sasl? ( dev-libs/cyrus-sasl:= ) !minimal? ( sys-devel/libtool sys-libs/e2fsprogs-libs >=dev-db/lmdb-0.9.14 tcpd? ( sys-apps/tcp-wrappers ) odbc? ( !iodbc? ( dev-db/unixODBC ) iodbc? ( dev-db/libiodbc ) ) slp? ( net-libs/openslp ) perl? ( dev-lang/perl[-build(-)] ) samba? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) berkdb? ( <sys-libs/db-6.0:= || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 sys-libs/db:4.4 ) ) smbkrb5passwd? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) kerberos? ( app-crypt/heimdal ) ) kerberos? ( virtual/krb5 kinit? ( !app-crypt/heimdal ) ) cxx? ( dev-libs/cyrus-sasl:= ) ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508-r3 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) sys-apps/groff ssl? ( dev-libs/openssl:0 ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
 DESCRIPTION=LDAP suite of application and development tools
 EAPI=5
 HOMEPAGE=http://www.OpenLDAP.org/
@@ -10,5 +10,5 @@ RDEPEND=icu? ( dev-libs/icu:= ) ssl? ( !gnutls? ( !libressl? ( >=dev-libs/openss
 REQUIRED_USE=cxx? ( sasl ) ?? ( gnutls libressl )
 SLOT=0
 SRC_URI=ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/openldap-2.4.43.tgz mirror://gentoo/rfc2307bis.schema-20140524
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	db-use	a4966c7f4f7df444ead1212848c13cc9	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	23ae8c186171e6476af098d2a50d0ee0	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	ssl-cert	b29ef3f715f3a76f1bf807b7e8751096	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	db-use	a4966c7f4f7df444ead1212848c13cc9	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	23ae8c186171e6476af098d2a50d0ee0	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	ssl-cert	6f7d720c036362122b0bfb4461e56a11	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5a609c0de1ee103a62e94b8db277e937
diff --git a/metadata/md5-cache/net-nds/openldap-2.4.44 b/metadata/md5-cache/net-nds/openldap-2.4.44
index 0d2d62ec34a4..f3482a5f8d42 100644
--- a/metadata/md5-cache/net-nds/openldap-2.4.44
+++ b/metadata/md5-cache/net-nds/openldap-2.4.44
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup test
-DEPEND=icu? ( dev-libs/icu:= ) ssl? ( !gnutls? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) gnutls? ( >=net-libs/gnutls-2.12.23-r6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] libressl? ( dev-libs/libressl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=dev-libs/libgcrypt-1.5.3:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) sasl? ( dev-libs/cyrus-sasl:= ) !minimal? ( sys-devel/libtool sys-libs/e2fsprogs-libs >=dev-db/lmdb-0.9.14:= tcpd? ( sys-apps/tcp-wrappers ) odbc? ( !iodbc? ( dev-db/unixODBC ) iodbc? ( dev-db/libiodbc ) ) slp? ( net-libs/openslp ) perl? ( dev-lang/perl[-build(-)] ) samba? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) berkdb? ( <sys-libs/db-6.0:= || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 sys-libs/db:4.4 ) ) smbkrb5passwd? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) kerberos? ( app-crypt/heimdal ) ) kerberos? ( virtual/krb5 kinit? ( !app-crypt/heimdal ) ) cxx? ( dev-libs/cyrus-sasl:= ) ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508-r3 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) sys-apps/groff ssl? ( dev-libs/openssl:0= ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEPEND=icu? ( dev-libs/icu:= ) ssl? ( !gnutls? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) gnutls? ( >=net-libs/gnutls-2.12.23-r6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] libressl? ( dev-libs/libressl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=dev-libs/libgcrypt-1.5.3:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) sasl? ( dev-libs/cyrus-sasl:= ) !minimal? ( sys-devel/libtool sys-libs/e2fsprogs-libs >=dev-db/lmdb-0.9.14:= tcpd? ( sys-apps/tcp-wrappers ) odbc? ( !iodbc? ( dev-db/unixODBC ) iodbc? ( dev-db/libiodbc ) ) slp? ( net-libs/openslp ) perl? ( dev-lang/perl[-build(-)] ) samba? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) berkdb? ( <sys-libs/db-6.0:= || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 sys-libs/db:4.4 ) ) smbkrb5passwd? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) kerberos? ( app-crypt/heimdal ) ) kerberos? ( virtual/krb5 kinit? ( !app-crypt/heimdal ) ) cxx? ( dev-libs/cyrus-sasl:= ) ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508-r3 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) sys-apps/groff ssl? ( dev-libs/openssl:0 ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
 DESCRIPTION=LDAP suite of application and development tools
 EAPI=5
 HOMEPAGE=http://www.OpenLDAP.org/
@@ -10,5 +10,5 @@ RDEPEND=icu? ( dev-libs/icu:= ) ssl? ( !gnutls? ( !libressl? ( >=dev-libs/openss
 REQUIRED_USE=cxx? ( sasl ) ?? ( gnutls libressl )
 SLOT=0
 SRC_URI=ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/openldap-2.4.44.tgz mirror://gentoo/rfc2307bis.schema-20140524
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	db-use	a4966c7f4f7df444ead1212848c13cc9	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	23ae8c186171e6476af098d2a50d0ee0	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	ssl-cert	b29ef3f715f3a76f1bf807b7e8751096	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	db-use	a4966c7f4f7df444ead1212848c13cc9	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	23ae8c186171e6476af098d2a50d0ee0	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	ssl-cert	6f7d720c036362122b0bfb4461e56a11	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=80652da71c8b4ab152a4d2d2127d872f
diff --git a/metadata/md5-cache/net-nntp/inn-2.5.3-r1 b/metadata/md5-cache/net-nntp/inn-2.5.3-r1
index 6ce1e8ec0ca8..70e6c0e5e1e2 100644
--- a/metadata/md5-cache/net-nntp/inn-2.5.3-r1
+++ b/metadata/md5-cache/net-nntp/inn-2.5.3-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=config configure install postinst postrm prepare setup
-DEPEND=virtual/mta dev-perl/MIME-tools sys-libs/pam sys-libs/zlib kerberos? ( virtual/krb5 ) sasl? ( >=dev-libs/cyrus-sasl-2 ) ssl? ( dev-libs/openssl ) python? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) berkdb? ( sys-libs/db ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ssl? ( dev-libs/openssl:0= )
+DEPEND=virtual/mta dev-perl/MIME-tools sys-libs/pam sys-libs/zlib kerberos? ( virtual/krb5 ) sasl? ( >=dev-libs/cyrus-sasl-2 ) ssl? ( dev-libs/openssl ) python? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) berkdb? ( sys-libs/db ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ssl? ( dev-libs/openssl:0 )
 DESCRIPTION=The Internet News daemon, fully featured NNTP server
 EAPI=5
 HOMEPAGE=https://www.isc.org/software/inn
@@ -9,5 +9,5 @@ LICENSE=ISC GPL-2+ public-domain BSD-4 BSD-2 RSA BSD MIT GPL-2
 RDEPEND=virtual/mta dev-perl/MIME-tools sys-libs/pam sys-libs/zlib kerberos? ( virtual/krb5 ) sasl? ( >=dev-libs/cyrus-sasl-2 ) ssl? ( dev-libs/openssl ) python? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) berkdb? ( sys-libs/db )
 SLOT=0
 SRC_URI=ftp://ftp.isc.org/isc/inn/inn-2.5.3.tar.gz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	libtool	4890219c51da247200223277f993e054	multilib	23ae8c186171e6476af098d2a50d0ee0	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	ssl-cert	b29ef3f715f3a76f1bf807b7e8751096	toolchain-funcs	d513d423d449877e49d99af3f7af7acb
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	libtool	4890219c51da247200223277f993e054	multilib	23ae8c186171e6476af098d2a50d0ee0	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	ssl-cert	6f7d720c036362122b0bfb4461e56a11	toolchain-funcs	d513d423d449877e49d99af3f7af7acb
 _md5_=16432738fbc9f68f47a39aaa75e328c5
diff --git a/metadata/md5-cache/net-nntp/inn-2.5.3-r2 b/metadata/md5-cache/net-nntp/inn-2.5.3-r2
index f8988ede3a46..8d7e7c155e83 100644
--- a/metadata/md5-cache/net-nntp/inn-2.5.3-r2
+++ b/metadata/md5-cache/net-nntp/inn-2.5.3-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=config configure install postinst postrm prepare setup
-DEPEND=virtual/mta dev-perl/MIME-tools sys-libs/pam sys-libs/zlib kerberos? ( virtual/krb5 ) sasl? ( >=dev-libs/cyrus-sasl-2 ) ssl? ( dev-libs/openssl ) python? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) berkdb? ( sys-libs/db ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ssl? ( dev-libs/openssl:0= )
+DEPEND=virtual/mta dev-perl/MIME-tools sys-libs/pam sys-libs/zlib kerberos? ( virtual/krb5 ) sasl? ( >=dev-libs/cyrus-sasl-2 ) ssl? ( dev-libs/openssl ) python? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) berkdb? ( sys-libs/db ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ssl? ( dev-libs/openssl:0 )
 DESCRIPTION=The Internet News daemon, fully featured NNTP server
 EAPI=5
 HOMEPAGE=https://www.isc.org/software/inn
@@ -10,5 +10,5 @@ RDEPEND=virtual/mta dev-perl/MIME-tools sys-libs/pam sys-libs/zlib kerberos? ( v
 REQUIRED_USE=python? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=ftp://ftp.isc.org/isc/inn/inn-2.5.3.tar.gz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	libtool	4890219c51da247200223277f993e054	multilib	23ae8c186171e6476af098d2a50d0ee0	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	ssl-cert	b29ef3f715f3a76f1bf807b7e8751096	toolchain-funcs	d513d423d449877e49d99af3f7af7acb
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	libtool	4890219c51da247200223277f993e054	multilib	23ae8c186171e6476af098d2a50d0ee0	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	ssl-cert	6f7d720c036362122b0bfb4461e56a11	toolchain-funcs	d513d423d449877e49d99af3f7af7acb
 _md5_=995f9b14bd3dcb7b01b76fab214757ae
diff --git a/metadata/md5-cache/net-nntp/inn-2.5.4 b/metadata/md5-cache/net-nntp/inn-2.5.4
index 3493c170d213..205bbb7e51cd 100644
--- a/metadata/md5-cache/net-nntp/inn-2.5.4
+++ b/metadata/md5-cache/net-nntp/inn-2.5.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=config configure install postinst postrm prepare setup
-DEPEND=virtual/mta dev-perl/MIME-tools sys-libs/pam sys-libs/zlib kerberos? ( virtual/krb5 ) sasl? ( >=dev-libs/cyrus-sasl-2 ) ssl? ( dev-libs/openssl ) python? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) berkdb? ( sys-libs/db ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ssl? ( dev-libs/openssl:0= )
+DEPEND=virtual/mta dev-perl/MIME-tools sys-libs/pam sys-libs/zlib kerberos? ( virtual/krb5 ) sasl? ( >=dev-libs/cyrus-sasl-2 ) ssl? ( dev-libs/openssl ) python? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) berkdb? ( sys-libs/db ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ssl? ( dev-libs/openssl:0 )
 DESCRIPTION=The Internet News daemon, fully featured NNTP server
 EAPI=5
 HOMEPAGE=https://www.isc.org/software/inn
@@ -10,5 +10,5 @@ RDEPEND=virtual/mta dev-perl/MIME-tools sys-libs/pam sys-libs/zlib kerberos? ( v
 REQUIRED_USE=python? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=ftp://ftp.isc.org/isc/inn/inn-2.5.4.tar.gz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	libtool	4890219c51da247200223277f993e054	multilib	23ae8c186171e6476af098d2a50d0ee0	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	ssl-cert	b29ef3f715f3a76f1bf807b7e8751096	toolchain-funcs	d513d423d449877e49d99af3f7af7acb
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	libtool	4890219c51da247200223277f993e054	multilib	23ae8c186171e6476af098d2a50d0ee0	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	ssl-cert	6f7d720c036362122b0bfb4461e56a11	toolchain-funcs	d513d423d449877e49d99af3f7af7acb
 _md5_=b91cb9f0eed27525f8527d0e9bf1b353
diff --git a/metadata/md5-cache/net-nntp/inn-2.5.5 b/metadata/md5-cache/net-nntp/inn-2.5.5
index 97b62aae2be6..7df96293125e 100644
--- a/metadata/md5-cache/net-nntp/inn-2.5.5
+++ b/metadata/md5-cache/net-nntp/inn-2.5.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=config configure install postinst postrm prepare setup
-DEPEND=virtual/mta dev-perl/MIME-tools sys-libs/pam sys-libs/zlib kerberos? ( virtual/krb5 ) sasl? ( >=dev-libs/cyrus-sasl-2 ) ssl? ( dev-libs/openssl ) python? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) berkdb? ( sys-libs/db ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ssl? ( dev-libs/openssl:0= )
+DEPEND=virtual/mta dev-perl/MIME-tools sys-libs/pam sys-libs/zlib kerberos? ( virtual/krb5 ) sasl? ( >=dev-libs/cyrus-sasl-2 ) ssl? ( dev-libs/openssl ) python? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) berkdb? ( sys-libs/db ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ssl? ( dev-libs/openssl:0 )
 DESCRIPTION=The Internet News daemon, fully featured NNTP server
 EAPI=5
 HOMEPAGE=https://www.isc.org/software/inn
@@ -10,5 +10,5 @@ RDEPEND=virtual/mta dev-perl/MIME-tools sys-libs/pam sys-libs/zlib kerberos? ( v
 REQUIRED_USE=python? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=ftp://ftp.isc.org/isc/inn/inn-2.5.5.tar.gz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	libtool	4890219c51da247200223277f993e054	multilib	23ae8c186171e6476af098d2a50d0ee0	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	ssl-cert	b29ef3f715f3a76f1bf807b7e8751096	toolchain-funcs	d513d423d449877e49d99af3f7af7acb
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	libtool	4890219c51da247200223277f993e054	multilib	23ae8c186171e6476af098d2a50d0ee0	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	ssl-cert	6f7d720c036362122b0bfb4461e56a11	toolchain-funcs	d513d423d449877e49d99af3f7af7acb
 _md5_=b91cb9f0eed27525f8527d0e9bf1b353
diff --git a/metadata/md5-cache/sci-calculators/pcalc-1.2 b/metadata/md5-cache/sci-calculators/pcalc-1.2
deleted file mode 100644
index 915ea25cb47e..000000000000
--- a/metadata/md5-cache/sci-calculators/pcalc-1.2
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=the programmers calculator
-EAPI=0
-HOMEPAGE=https://github.com/vapier/pcalc
-KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://sourceforge/pcalc/pcalc-1.2.tar.bz2
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb
-_md5_=a69e7e945da169862c04b050fcf6866e
diff --git a/metadata/md5-cache/sci-calculators/pcalc-1.3 b/metadata/md5-cache/sci-calculators/pcalc-1.3
deleted file mode 100644
index 8a102ac38741..000000000000
--- a/metadata/md5-cache/sci-calculators/pcalc-1.3
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=sys-devel/flex
-DESCRIPTION=the programmers calculator
-EAPI=0
-HOMEPAGE=https://github.com/vapier/pcalc
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://sourceforge/pcalc/pcalc-1.3.tar.lzma
-_eclasses_=multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb
-_md5_=7b3ac52530e2ddf73281a534775c50ac
diff --git a/metadata/md5-cache/sys-apps/systemd-229 b/metadata/md5-cache/sys-apps/systemd-229
index 01573622cb5c..7ee3f7fd4f50 100644
--- a/metadata/md5-cache/sys-apps/systemd-229
+++ b/metadata/md5-cache/sys-apps/systemd-229
@@ -12,4 +12,4 @@ REQUIRED_USE=importd? ( curl gcrypt lzma )
 SLOT=0/2
 SRC_URI=https://github.com/systemd/systemd/archive/v229.tar.gz -> systemd-229.tar.gz https://dev.gentoo.org/~floppym/dist/systemd-229-patches.tar.gz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	libtool	4890219c51da247200223277f993e054	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	23ae8c186171e6476af098d2a50d0ee0	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	udev	73058269b3e70e34e084fa3981282338	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=dcb835fcc14a6d95315ea4c3574fb929
+_md5_=a0a68011aeaa3c5fc899c709f33a3747
diff --git a/metadata/md5-cache/sys-apps/systemd-229-r100 b/metadata/md5-cache/sys-apps/systemd-229-r100
index d7a587ea25e3..dbf032635f98 100644
--- a/metadata/md5-cache/sys-apps/systemd-229-r100
+++ b/metadata/md5-cache/sys-apps/systemd-229-r100
@@ -12,4 +12,4 @@ REQUIRED_USE=importd? ( curl gcrypt lzma )
 SLOT=0/2
 SRC_URI=https://github.com/systemd/systemd/archive/v229.tar.gz -> systemd-229.tar.gz https://dev.gentoo.org/~floppym/dist/systemd-229-patches.tar.gz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	libtool	4890219c51da247200223277f993e054	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	23ae8c186171e6476af098d2a50d0ee0	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	udev	73058269b3e70e34e084fa3981282338	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=b8341bf1ead6aae8461296c5c088b972
+_md5_=8f5776612965f918ca31892a42fdd461
diff --git a/metadata/md5-cache/sys-block/mtx-1.2.18 b/metadata/md5-cache/sys-block/mtx-1.2.18
deleted file mode 100644
index 69d1bb24ed30..000000000000
--- a/metadata/md5-cache/sys-block/mtx-1.2.18
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DESCRIPTION=Utilities for controlling SCSI media changers and tape drives
-EAPI=0
-HOMEPAGE=http://mtx.sourceforge.net
-KEYWORDS=x86 amd64 sparc alpha ppc hppa ppc64
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=ftp://ftp.badtux.net/pub/storage/mtx/mtx-1.2.18rel.tar.gz
-_md5_=35a5c7f7cc6fc903ae9a5e71a542daca
diff --git a/metadata/md5-cache/sys-block/qla-fc-firmware-20071207-r1 b/metadata/md5-cache/sys-block/qla-fc-firmware-20071207-r1
deleted file mode 100644
index e3917b3dbf06..000000000000
--- a/metadata/md5-cache/sys-block/qla-fc-firmware-20071207-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=QLogic Linux Fibre Channel HBA Firmware for ql2xxx cards
-EAPI=0
-HOMEPAGE=ftp://ftp.qlogic.com/outgoing/linux/firmware/
-KEYWORDS=amd64 ppc sparc x86
-LICENSE=qlogic-fibre-channel-firmware
-RDEPEND=!sys-kernel/linux-firmware
-SLOT=0
-SRC_URI=mirror://gentoo/qla-fc-firmware-20071207.tar.bz2
-_md5_=2116467b31f56c44c24209f7986dfb9c
diff --git a/metadata/md5-cache/sys-block/qla-fc-firmware-20080423 b/metadata/md5-cache/sys-block/qla-fc-firmware-20080423
deleted file mode 100644
index 500773fd229a..000000000000
--- a/metadata/md5-cache/sys-block/qla-fc-firmware-20080423
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=QLogic Linux Fibre Channel HBA Firmware for ql2xxx cards
-EAPI=0
-HOMEPAGE=ftp://ftp.qlogic.com/outgoing/linux/firmware/
-KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=qlogic-fibre-channel-firmware
-RDEPEND=!sys-kernel/linux-firmware
-SLOT=0
-SRC_URI=mirror://gentoo/qla-fc-firmware-20080423.tar.bz2
-_md5_=543f7dfa1876c20b09e003c99df067c1
diff --git a/metadata/md5-cache/sys-block/seekwatcher-0.9 b/metadata/md5-cache/sys-block/seekwatcher-0.9
deleted file mode 100644
index fb439ca6ae0d..000000000000
--- a/metadata/md5-cache/sys-block/seekwatcher-0.9
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install postinst
-DESCRIPTION=Seekwatcher generates graphs from blktrace runs to help visualize IO patterns and performance
-EAPI=0
-HOMEPAGE=http://oss.oracle.com/~mason/seekwatcher/
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-python/matplotlib-0.90.1 >=sys-block/btrace-0.0.20070730162628
-SLOT=0
-SRC_URI=http://oss.oracle.com/~mason/seekwatcher/seekwatcher-0.9.tar.bz2
-_md5_=15f017d0d51ff68f284a2a47332b6c8e
diff --git a/metadata/md5-cache/sys-block/tw_cli-9.3.0.2 b/metadata/md5-cache/sys-block/tw_cli-9.3.0.2
deleted file mode 100644
index 8eb8628ef417..000000000000
--- a/metadata/md5-cache/sys-block/tw_cli-9.3.0.2
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install nofetch setup unpack
-DESCRIPTION=3ware SATA+PATA RAID controller Command Line Interface tool
-EAPI=0
-HOMEPAGE=http://www.3ware.com/
-KEYWORDS=-* ~x86 ~amd64
-LICENSE=3ware
-RESTRICT=fetch strip mirror
-SLOT=0
-SRC_URI=x86? ( http://www.3ware.com/download/Escalade9000Series/9.3.0.2/tw_cli-linux-x86-9.3.0.2.tgz ) amd64? ( http://www.3ware.com/download/Escalade9000Series/9.3.0.2/tw_cli-linux-x86_64-9.3.0.2.tgz )
-_md5_=a05bff09d16261f3e2a81ce1420bf32d
diff --git a/metadata/md5-cache/sys-block/tw_cli-9.3.0.3 b/metadata/md5-cache/sys-block/tw_cli-9.3.0.3
deleted file mode 100644
index 3cc947a26743..000000000000
--- a/metadata/md5-cache/sys-block/tw_cli-9.3.0.3
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install nofetch setup unpack
-DESCRIPTION=3ware SATA+PATA RAID controller Command Line Interface tool
-EAPI=0
-HOMEPAGE=http://www.3ware.com/
-KEYWORDS=-* ~x86 ~amd64
-LICENSE=3ware
-RESTRICT=fetch strip mirror
-SLOT=0
-SRC_URI=x86? ( http://www.3ware.com/download/Escalade7000Series/9.3.0.3/tw_cli-linux-x86-9.3.0.3.tgz ) amd64? ( http://www.3ware.com/download/Escalade7000Series/9.3.0.3/tw_cli-linux-x86_64-9.3.0.3.tgz )
-_md5_=0f9b2616cc976f12148f180ce3f0dec4
diff --git a/metadata/md5-cache/sys-block/tw_cli-9.4.0 b/metadata/md5-cache/sys-block/tw_cli-9.4.0
deleted file mode 100644
index cf74613a8590..000000000000
--- a/metadata/md5-cache/sys-block/tw_cli-9.4.0
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install nofetch setup unpack
-DESCRIPTION=3ware SATA+PATA RAID controller Command Line Interface tool
-EAPI=0
-HOMEPAGE=http://www.3ware.com/
-KEYWORDS=-* amd64 x86
-LICENSE=3ware
-RESTRICT=fetch strip mirror
-SLOT=0
-SRC_URI=x86? ( http://www.3ware.com/download/Escalade9650SE-Series/9.4.0/tw_cli-linux-x86-9.4.0.tgz ) amd64? ( http://www.3ware.com/download/Escalade9650SE-Series/9.4.0/tw_cli-linux-x86_64-9.4.0.tgz )
-_md5_=b48b6c19b373de3a7510fcb4fb14c013
diff --git a/metadata/md5-cache/sys-block/tw_cli-9.4.0.1 b/metadata/md5-cache/sys-block/tw_cli-9.4.0.1
deleted file mode 100644
index 798a0d8d07f4..000000000000
--- a/metadata/md5-cache/sys-block/tw_cli-9.4.0.1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install nofetch setup unpack
-DESCRIPTION=3ware SATA+PATA RAID controller Command Line Interface tool
-EAPI=0
-HOMEPAGE=http://www.3ware.com/
-KEYWORDS=-* ~amd64 ~x86
-LICENSE=3ware
-RESTRICT=fetch strip mirror
-SLOT=0
-SRC_URI=x86? ( http://www.3ware.com/download/Escalade9650SE-Series/9.4.0.1/tw_cli-linux-x86-9.4.0.1.tgz ) amd64? ( http://www.3ware.com/download/Escalade9650SE-Series/9.4.0.1/tw_cli-linux-x86_64-9.4.0.1.tgz )
-_md5_=7bb2e2cc18c872254b6d2423f8fc869a
diff --git a/metadata/md5-cache/sys-block/tw_cli-9.5.0 b/metadata/md5-cache/sys-block/tw_cli-9.5.0
deleted file mode 100644
index 51ecd2a3d481..000000000000
--- a/metadata/md5-cache/sys-block/tw_cli-9.5.0
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install nofetch setup unpack
-DESCRIPTION=3ware SATA+PATA RAID controller Command Line Interface tool
-EAPI=0
-HOMEPAGE=https://www.3ware.com/3warekb/article.aspx?id=14847
-KEYWORDS=-* ~amd64 ~x86
-LICENSE=3ware
-RESTRICT=fetch strip mirror
-SLOT=0
-SRC_URI=x86? ( http://www.3ware.com/download/Escalade9690SA-Series/9.5.0/tw_cli-linux-x86-9.5.0.tgz ) amd64? ( http://www.3ware.com/download/Escalade9690SA-Series/9.5.0/tw_cli-linux-x86_64-9.5.0.tgz )
-_md5_=438f9f386a18d98d68ddda784a86667d
diff --git a/metadata/md5-cache/sys-block/tw_cli-9.5.0.1 b/metadata/md5-cache/sys-block/tw_cli-9.5.0.1
deleted file mode 100644
index b444fb7bce29..000000000000
--- a/metadata/md5-cache/sys-block/tw_cli-9.5.0.1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install nofetch setup unpack
-DESCRIPTION=3ware SATA+PATA RAID controller Command Line Interface tool
-EAPI=0
-HOMEPAGE=https://www.3ware.com/3warekb/article.aspx?id=14847
-KEYWORDS=-* ~amd64 ~x86 ~x86-fbsd
-LICENSE=3ware
-RESTRICT=fetch strip mirror
-SLOT=0
-SRC_URI=x86? ( http://www.3ware.com/download/Escalade9690SA-Series/9.5.0.1/tw_cli-linux-x86-9.5.0.1.tgz ) amd64? ( http://www.3ware.com/download/Escalade9690SA-Series/9.5.0.1/tw_cli-linux-x86_64-9.5.0.1.tgz ) x86-fbsd? ( http://www.3ware.com/download/Escalade9690SA-Series/9.5.0.1/tw_cli-freebsd-x86-9.5.0.1.tgz )
-_md5_=01a20178cb386433a8fd1e12932a2d7e
diff --git a/metadata/md5-cache/sys-block/tw_cli-9.5.1.1 b/metadata/md5-cache/sys-block/tw_cli-9.5.1.1
deleted file mode 100644
index 17a2d37cecf9..000000000000
--- a/metadata/md5-cache/sys-block/tw_cli-9.5.1.1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install nofetch setup unpack
-DESCRIPTION=3ware SATA+PATA RAID controller Command Line Interface tool
-EAPI=0
-HOMEPAGE=https://www.3ware.com/3warekb/article.aspx?id=14847
-KEYWORDS=-* ~amd64 ~x86 ~x86-fbsd
-LICENSE=3ware
-RESTRICT=fetch strip mirror
-SLOT=0
-SRC_URI=x86? ( http://www.3ware.com/download/Escalade9690SA-Series/9.5.1.1/tw_cli-linux-x86-9.5.1.1.tgz ) amd64? ( http://www.3ware.com/download/Escalade9690SA-Series/9.5.1.1/tw_cli-linux-x86_64-9.5.1.1.tgz ) x86-fbsd? ( http://www.3ware.com/download/Escalade9690SA-Series/9.5.1.1/tw_cli-freebsd-x86-9.5.1.1.tgz )
-_md5_=b355337ae4972b5eb44a88d658f3310b
diff --git a/metadata/md5-cache/sys-fs/mtd-utils-1.5.2 b/metadata/md5-cache/sys-fs/mtd-utils-1.5.2
index eeb939782a5a..eb16e7fc7db8 100644
--- a/metadata/md5-cache/sys-fs/mtd-utils-1.5.2
+++ b/metadata/md5-cache/sys-fs/mtd-utils-1.5.2
@@ -1,4 +1,4 @@
-DEFINED_PHASES=compile install unpack
+DEFINED_PHASES=compile install prepare unpack
 DEPEND=!sys-fs/mtd dev-libs/lzo sys-libs/zlib >=sys-apps/util-linux-2.16 xattr? ( sys-apps/acl )
 DESCRIPTION=MTD userspace tools (NFTL, JFFS2, NAND, FTL, UBI)
 EAPI=4
@@ -10,4 +10,4 @@ RDEPEND=!sys-fs/mtd dev-libs/lzo sys-libs/zlib >=sys-apps/util-linux-2.16
 SLOT=0
 SRC_URI=http://git.infradead.org/mtd-utils.git/snapshot/v1.5.2.tar.gz -> mtd-utils-1.5.2.tar.gz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	vcs-snapshot	b45be87e7012be0af8424e8a5644da1d
-_md5_=9a40d9e3e32618bdae7bfe0c23b5e14f
+_md5_=31f58df412cf238d03f317f6325c978f
diff --git a/metadata/md5-cache/sys-process/memwatch-0.1.0 b/metadata/md5-cache/sys-process/memwatch-0.1.0
new file mode 100644
index 000000000000..88cfa89293bf
--- /dev/null
+++ b/metadata/md5-cache/sys-process/memwatch-0.1.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sys-libs/ncurses:0= sys-devel/make >=dev-util/cmake-2.8.12
+DESCRIPTION=Interactive memory viewer
+EAPI=6
+HOMEPAGE=https://bitbucket.org/PascalRD/memwatch/
+KEYWORDS=~amd64 ~x86
+LICENSE=WTFPL-2
+RDEPEND=sys-libs/ncurses:0=
+SLOT=0
+SRC_URI=http://unixdev.ru/src/memwatch-0.1.0.tar.gz
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=955bfb110af8dcd934298ac6eb526356
diff --git a/metadata/md5-cache/sys-process/procenv-0.35 b/metadata/md5-cache/sys-process/procenv-0.35
deleted file mode 100644
index edb706fd8202..000000000000
--- a/metadata/md5-cache/sys-process/procenv-0.35
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=A command-line utility that simply dumps all attributes of its environment
-EAPI=5
-HOMEPAGE=https://launchpad.net/procenv/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-SLOT=0
-SRC_URI=https://launchpad.net/procenv/trunk/0.35/+download/procenv-0.35.tar.gz
-_md5_=c1b484a06a4463917d7f8c8247a7db87
diff --git a/metadata/md5-cache/sys-process/procenv-0.36 b/metadata/md5-cache/sys-process/procenv-0.36
deleted file mode 100644
index 0849967b39a0..000000000000
--- a/metadata/md5-cache/sys-process/procenv-0.36
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=A command-line utility that simply dumps all attributes of its environment
-EAPI=5
-HOMEPAGE=https://launchpad.net/procenv/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-SLOT=0
-SRC_URI=https://launchpad.net/procenv/trunk/0.36/+download/procenv-0.36.tar.gz
-_md5_=c1b484a06a4463917d7f8c8247a7db87
diff --git a/metadata/md5-cache/sys-process/procenv-0.45 b/metadata/md5-cache/sys-process/procenv-0.45
index 4aacc9b95d96..cbdd424df924 100644
--- a/metadata/md5-cache/sys-process/procenv-0.45
+++ b/metadata/md5-cache/sys-process/procenv-0.45
@@ -1,4 +1,4 @@
-DEFINED_PHASES=-
+DEFINED_PHASES=prepare
 DEPEND=virtual/pkgconfig test? ( dev-libs/check )
 DESCRIPTION=command-line utility to show process environment
 EAPI=5
@@ -8,4 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=https://github.com/jamesodhunt/procenv/archive/0.45.tar.gz -> procenv-0.45.tar.gz
-_md5_=30949bdfc8aa2f18278850335274892f
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb
+_md5_=01315219c061f14277413d04b3d7fd9e
diff --git a/metadata/md5-cache/www-misc/vdradmin-am-3.6.10 b/metadata/md5-cache/www-misc/vdradmin-am-3.6.10
index e3a96bd46c81..849186c04afd 100644
--- a/metadata/md5-cache/www-misc/vdradmin-am-3.6.10
+++ b/metadata/md5-cache/www-misc/vdradmin-am-3.6.10
@@ -1,5 +1,5 @@
 DEFINED_PHASES=config install postinst preinst prepare setup unpack
-DEPEND=dev-lang/perl dev-perl/Template-Toolkit dev-perl/libwww-perl dev-perl/URI dev-perl/Locale-gettext virtual/perl-IO-Compress ipv6? ( dev-perl/IO-Socket-INET6 ) ssl? ( dev-perl/IO-Socket-SSL ) virtual/perl-libnet dev-perl/Authen-SASL dev-perl/Digest-HMAC ssl? ( dev-libs/openssl:0= ) virtual/pkgconfig
+DEPEND=dev-lang/perl dev-perl/Template-Toolkit dev-perl/libwww-perl dev-perl/URI dev-perl/Locale-gettext virtual/perl-IO-Compress ipv6? ( dev-perl/IO-Socket-INET6 ) ssl? ( dev-perl/IO-Socket-SSL ) virtual/perl-libnet dev-perl/Authen-SASL dev-perl/Digest-HMAC ssl? ( dev-libs/openssl:0 ) virtual/pkgconfig
 DESCRIPTION=WWW Admin for the Video Disk Recorder
 EAPI=5
 HOMEPAGE=http://andreas.vdr-developer.org/vdradmin-am/index.html
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-lang/perl dev-perl/Template-Toolkit dev-perl/libwww-perl dev-perl/URI dev-perl/Locale-gettext virtual/perl-IO-Compress ipv6? ( dev-perl/IO-Socket-INET6 ) ssl? ( dev-perl/IO-Socket-SSL ) virtual/perl-libnet dev-perl/Authen-SASL dev-perl/Digest-HMAC
 SLOT=0
 SRC_URI=http://andreas.vdr-developer.org/vdradmin-am/download/vdradmin-am-3.6.10.tar.bz2
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	multilib	23ae8c186171e6476af098d2a50d0ee0	ssl-cert	b29ef3f715f3a76f1bf807b7e8751096	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	user	906f3c8eb3a2350a4f1191a89baa3e46
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	multilib	23ae8c186171e6476af098d2a50d0ee0	ssl-cert	6f7d720c036362122b0bfb4461e56a11	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	user	906f3c8eb3a2350a4f1191a89baa3e46
 _md5_=667b976a51ec4c7888b56eeb25f3e924
diff --git a/metadata/md5-cache/www-misc/vdradmin-am-3.6.9 b/metadata/md5-cache/www-misc/vdradmin-am-3.6.9
index fe36497d6353..f70fbeddf597 100644
--- a/metadata/md5-cache/www-misc/vdradmin-am-3.6.9
+++ b/metadata/md5-cache/www-misc/vdradmin-am-3.6.9
@@ -1,5 +1,5 @@
 DEFINED_PHASES=config install postinst preinst prepare setup
-DEPEND=dev-lang/perl dev-perl/Template-Toolkit dev-perl/libwww-perl dev-perl/URI dev-perl/Locale-gettext virtual/perl-IO-Compress ipv6? ( dev-perl/IO-Socket-INET6 ) ssl? ( dev-perl/IO-Socket-SSL ) vdr? ( media-video/vdr ) virtual/perl-libnet dev-perl/Authen-SASL dev-perl/Digest-HMAC ssl? ( dev-libs/openssl:0= )
+DEPEND=dev-lang/perl dev-perl/Template-Toolkit dev-perl/libwww-perl dev-perl/URI dev-perl/Locale-gettext virtual/perl-IO-Compress ipv6? ( dev-perl/IO-Socket-INET6 ) ssl? ( dev-perl/IO-Socket-SSL ) vdr? ( media-video/vdr ) virtual/perl-libnet dev-perl/Authen-SASL dev-perl/Digest-HMAC ssl? ( dev-libs/openssl:0 )
 DESCRIPTION=WWW Admin for the Video Disk Recorder
 EAPI=5
 HOMEPAGE=http://andreas.vdr-developer.org/vdradmin-am/index.html
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-lang/perl dev-perl/Template-Toolkit dev-perl/libwww-perl dev-perl/URI dev-perl/Locale-gettext virtual/perl-IO-Compress ipv6? ( dev-perl/IO-Socket-INET6 ) ssl? ( dev-perl/IO-Socket-SSL ) vdr? ( media-video/vdr ) virtual/perl-libnet dev-perl/Authen-SASL dev-perl/Digest-HMAC
 SLOT=0
 SRC_URI=http://andreas.vdr-developer.org/vdradmin-am/download/vdradmin-am-3.6.9.tar.bz2
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	multilib	23ae8c186171e6476af098d2a50d0ee0	ssl-cert	b29ef3f715f3a76f1bf807b7e8751096	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	user	906f3c8eb3a2350a4f1191a89baa3e46
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	multilib	23ae8c186171e6476af098d2a50d0ee0	ssl-cert	6f7d720c036362122b0bfb4461e56a11	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	user	906f3c8eb3a2350a4f1191a89baa3e46
 _md5_=162ebed93ee942266e86ce8b5a1df334
diff --git a/metadata/md5-cache/www-misc/vdradmin-am-3.6.9-r3 b/metadata/md5-cache/www-misc/vdradmin-am-3.6.9-r3
index 74efecd6fb64..1fb436944a4f 100644
--- a/metadata/md5-cache/www-misc/vdradmin-am-3.6.9-r3
+++ b/metadata/md5-cache/www-misc/vdradmin-am-3.6.9-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=config install postinst preinst prepare setup unpack
-DEPEND=dev-lang/perl dev-perl/Template-Toolkit dev-perl/libwww-perl dev-perl/URI dev-perl/Locale-gettext virtual/perl-IO-Compress ipv6? ( dev-perl/IO-Socket-INET6 ) ssl? ( dev-perl/IO-Socket-SSL ) virtual/perl-libnet dev-perl/Authen-SASL dev-perl/Digest-HMAC ssl? ( dev-libs/openssl:0= ) virtual/pkgconfig
+DEPEND=dev-lang/perl dev-perl/Template-Toolkit dev-perl/libwww-perl dev-perl/URI dev-perl/Locale-gettext virtual/perl-IO-Compress ipv6? ( dev-perl/IO-Socket-INET6 ) ssl? ( dev-perl/IO-Socket-SSL ) virtual/perl-libnet dev-perl/Authen-SASL dev-perl/Digest-HMAC ssl? ( dev-libs/openssl:0 ) virtual/pkgconfig
 DESCRIPTION=WWW Admin for the Video Disk Recorder
 EAPI=5
 HOMEPAGE=http://andreas.vdr-developer.org/vdradmin-am/index.html
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-lang/perl dev-perl/Template-Toolkit dev-perl/libwww-perl dev-perl/URI dev-perl/Locale-gettext virtual/perl-IO-Compress ipv6? ( dev-perl/IO-Socket-INET6 ) ssl? ( dev-perl/IO-Socket-SSL ) virtual/perl-libnet dev-perl/Authen-SASL dev-perl/Digest-HMAC
 SLOT=0
 SRC_URI=http://andreas.vdr-developer.org/vdradmin-am/download/vdradmin-am-3.6.9.tar.bz2
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	multilib	23ae8c186171e6476af098d2a50d0ee0	ssl-cert	b29ef3f715f3a76f1bf807b7e8751096	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	user	906f3c8eb3a2350a4f1191a89baa3e46
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	multilib	23ae8c186171e6476af098d2a50d0ee0	ssl-cert	6f7d720c036362122b0bfb4461e56a11	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	user	906f3c8eb3a2350a4f1191a89baa3e46
 _md5_=667b976a51ec4c7888b56eeb25f3e924
diff --git a/metadata/md5-cache/www-servers/apache-2.2.31 b/metadata/md5-cache/www-servers/apache-2.2.31
index 8392532fb696..755de6a56322 100644
--- a/metadata/md5-cache/www-servers/apache-2.2.31
+++ b/metadata/md5-cache/www-servers/apache-2.2.31
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=!<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ssl? ( dev-libs/openssl:0= ) dev-lang/perl =dev-libs/apr-1* =dev-libs/apr-util-1*[ldap?] dev-libs/libpcre apache2_modules_deflate? ( sys-libs/zlib ) apache2_modules_mime? ( app-misc/mime-types ) ldap? ( =net-nds/openldap-2* ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.2:0= ) libressl? ( dev-libs/libressl:= ) ) !=www-servers/apache-1* virtual/pkgconfig
+DEPEND=!<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ssl? ( dev-libs/openssl:0 ) dev-lang/perl =dev-libs/apr-1* =dev-libs/apr-util-1*[ldap?] dev-libs/libpcre apache2_modules_deflate? ( sys-libs/zlib ) apache2_modules_mime? ( app-misc/mime-types ) ldap? ( =net-nds/openldap-2* ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.2:0= ) libressl? ( dev-libs/libressl:= ) ) !=www-servers/apache-1* virtual/pkgconfig
 DESCRIPTION=The Apache Web Server
 EAPI=5
 HOMEPAGE=http://httpd.apache.org/
@@ -10,5 +10,5 @@ PDEPEND=~app-admin/apache-tools-2.2.31
 RDEPEND=>=dev-libs/apr-1.4.5 dev-lang/perl =dev-libs/apr-1* =dev-libs/apr-util-1*[ldap?] dev-libs/libpcre apache2_modules_deflate? ( sys-libs/zlib ) apache2_modules_mime? ( app-misc/mime-types ) ldap? ( =net-nds/openldap-2* ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.2:0= ) libressl? ( dev-libs/libressl:= ) ) !=www-servers/apache-1* selinux? ( sec-policy/selinux-apache )
 SLOT=2
 SRC_URI=mirror://apache/httpd/httpd-2.2.31.tar.bz2 https://dev.gentoo.org/~polynomial-c/dist/apache/gentoo-apache-2.2.29-20140922.tar.bz2
-_eclasses_=apache-2	d6aa6adb26a2cae934a099a0c82c6128	autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	libtool	4890219c51da247200223277f993e054	multilib	23ae8c186171e6476af098d2a50d0ee0	ssl-cert	b29ef3f715f3a76f1bf807b7e8751096	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=apache-2	d6aa6adb26a2cae934a099a0c82c6128	autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	libtool	4890219c51da247200223277f993e054	multilib	23ae8c186171e6476af098d2a50d0ee0	ssl-cert	6f7d720c036362122b0bfb4461e56a11	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=446580ddbc65f7a7b4340a04d2041143
diff --git a/metadata/md5-cache/www-servers/apache-2.4.18 b/metadata/md5-cache/www-servers/apache-2.4.18
index 4799a3f3f3c6..4d0c26ce0018 100644
--- a/metadata/md5-cache/www-servers/apache-2.4.18
+++ b/metadata/md5-cache/www-servers/apache-2.4.18
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=apache2_modules_http2? ( >=net-libs/nghttp2-1.2.1 ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ssl? ( dev-libs/openssl:0= ) dev-lang/perl =dev-libs/apr-1* =dev-libs/apr-util-1*[ldap?] dev-libs/libpcre apache2_modules_deflate? ( sys-libs/zlib ) apache2_modules_mime? ( app-misc/mime-types ) ldap? ( =net-nds/openldap-2* ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.2:0= ) libressl? ( dev-libs/libressl:= ) ) !=www-servers/apache-1* virtual/pkgconfig
+DEPEND=apache2_modules_http2? ( >=net-libs/nghttp2-1.2.1 ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ssl? ( dev-libs/openssl:0 ) dev-lang/perl =dev-libs/apr-1* =dev-libs/apr-util-1*[ldap?] dev-libs/libpcre apache2_modules_deflate? ( sys-libs/zlib ) apache2_modules_mime? ( app-misc/mime-types ) ldap? ( =net-nds/openldap-2* ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.2:0= ) libressl? ( dev-libs/libressl:= ) ) !=www-servers/apache-1* virtual/pkgconfig
 DESCRIPTION=The Apache Web Server
 EAPI=5
 HOMEPAGE=http://httpd.apache.org/
@@ -10,5 +10,5 @@ PDEPEND=~app-admin/apache-tools-2.4.18
 RDEPEND=>=dev-libs/apr-1.5.1 !www-apache/mod_macro dev-lang/perl =dev-libs/apr-1* =dev-libs/apr-util-1*[ldap?] dev-libs/libpcre apache2_modules_deflate? ( sys-libs/zlib ) apache2_modules_mime? ( app-misc/mime-types ) ldap? ( =net-nds/openldap-2* ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.2:0= ) libressl? ( dev-libs/libressl:= ) ) !=www-servers/apache-1* selinux? ( sec-policy/selinux-apache )
 SLOT=2
 SRC_URI=mirror://apache/httpd/httpd-2.4.18.tar.bz2 https://dev.gentoo.org/~polynomial-c/dist/apache/gentoo-apache-2.4.10-r1-20140731.tar.bz2
-_eclasses_=apache-2	d6aa6adb26a2cae934a099a0c82c6128	autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	libtool	4890219c51da247200223277f993e054	multilib	23ae8c186171e6476af098d2a50d0ee0	ssl-cert	b29ef3f715f3a76f1bf807b7e8751096	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=apache-2	d6aa6adb26a2cae934a099a0c82c6128	autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	libtool	4890219c51da247200223277f993e054	multilib	23ae8c186171e6476af098d2a50d0ee0	ssl-cert	6f7d720c036362122b0bfb4461e56a11	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c43e7bc922135efe1baaeaa0fd1b446b
diff --git a/metadata/md5-cache/www-servers/apache-2.4.18-r1 b/metadata/md5-cache/www-servers/apache-2.4.18-r1
index b814c18e0263..b45a8a0c633e 100644
--- a/metadata/md5-cache/www-servers/apache-2.4.18-r1
+++ b/metadata/md5-cache/www-servers/apache-2.4.18-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=apache2_modules_http2? ( >=net-libs/nghttp2-1.2.1 ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ssl? ( dev-libs/openssl:0= ) dev-lang/perl =dev-libs/apr-1* =dev-libs/apr-util-1*[ldap?] dev-libs/libpcre apache2_modules_deflate? ( sys-libs/zlib ) apache2_modules_mime? ( app-misc/mime-types ) ldap? ( =net-nds/openldap-2* ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.2:0= ) libressl? ( dev-libs/libressl:= ) ) !=www-servers/apache-1* virtual/pkgconfig
+DEPEND=apache2_modules_http2? ( >=net-libs/nghttp2-1.2.1 ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ssl? ( dev-libs/openssl:0 ) dev-lang/perl =dev-libs/apr-1* =dev-libs/apr-util-1*[ldap?] dev-libs/libpcre apache2_modules_deflate? ( sys-libs/zlib ) apache2_modules_mime? ( app-misc/mime-types ) ldap? ( =net-nds/openldap-2* ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.2:0= ) libressl? ( dev-libs/libressl:= ) ) !=www-servers/apache-1* virtual/pkgconfig
 DESCRIPTION=The Apache Web Server
 EAPI=5
 HOMEPAGE=http://httpd.apache.org/
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/apr-1.5.1 !www-apache/mod_macro dev-lang/perl =dev-libs/apr-1
 REQUIRED_USE=apache2_modules_http2? ( ssl )
 SLOT=2
 SRC_URI=mirror://apache/httpd/httpd-2.4.18.tar.bz2 https://dev.gentoo.org/~polynomial-c/dist/apache/gentoo-apache-2.4.18-r1-20160303.tar.bz2
-_eclasses_=apache-2	d6aa6adb26a2cae934a099a0c82c6128	autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	libtool	4890219c51da247200223277f993e054	multilib	23ae8c186171e6476af098d2a50d0ee0	ssl-cert	b29ef3f715f3a76f1bf807b7e8751096	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=apache-2	d6aa6adb26a2cae934a099a0c82c6128	autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	libtool	4890219c51da247200223277f993e054	multilib	23ae8c186171e6476af098d2a50d0ee0	ssl-cert	6f7d720c036362122b0bfb4461e56a11	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f57d1f728a5045043eb7301bf4b4cb05
diff --git a/metadata/md5-cache/www-servers/apache-2.4.20 b/metadata/md5-cache/www-servers/apache-2.4.20
index 68a6487217d6..47d27b0a4bc5 100644
--- a/metadata/md5-cache/www-servers/apache-2.4.20
+++ b/metadata/md5-cache/www-servers/apache-2.4.20
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=apache2_modules_http2? ( >=net-libs/nghttp2-1.2.1 ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ssl? ( dev-libs/openssl:0= ) dev-lang/perl =dev-libs/apr-1* =dev-libs/apr-util-1*[ldap?] dev-libs/libpcre apache2_modules_deflate? ( sys-libs/zlib ) apache2_modules_mime? ( app-misc/mime-types ) ldap? ( =net-nds/openldap-2* ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.2:0= ) libressl? ( dev-libs/libressl:= ) ) !=www-servers/apache-1* virtual/pkgconfig
+DEPEND=apache2_modules_http2? ( >=net-libs/nghttp2-1.2.1 ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ssl? ( dev-libs/openssl:0 ) dev-lang/perl =dev-libs/apr-1* =dev-libs/apr-util-1*[ldap?] dev-libs/libpcre apache2_modules_deflate? ( sys-libs/zlib ) apache2_modules_mime? ( app-misc/mime-types ) ldap? ( =net-nds/openldap-2* ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.2:0= ) libressl? ( dev-libs/libressl:= ) ) !=www-servers/apache-1* virtual/pkgconfig
 DESCRIPTION=The Apache Web Server
 EAPI=5
 HOMEPAGE=http://httpd.apache.org/
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/apr-1.5.1 !www-apache/mod_macro dev-lang/perl =dev-libs/apr-1
 REQUIRED_USE=apache2_modules_http2? ( ssl )
 SLOT=2
 SRC_URI=mirror://apache/httpd/httpd-2.4.20.tar.bz2 https://dev.gentoo.org/~polynomial-c/dist/apache/gentoo-apache-2.4.18-r1-20160303.tar.bz2
-_eclasses_=apache-2	d6aa6adb26a2cae934a099a0c82c6128	autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	libtool	4890219c51da247200223277f993e054	multilib	23ae8c186171e6476af098d2a50d0ee0	ssl-cert	b29ef3f715f3a76f1bf807b7e8751096	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=apache-2	d6aa6adb26a2cae934a099a0c82c6128	autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	libtool	4890219c51da247200223277f993e054	multilib	23ae8c186171e6476af098d2a50d0ee0	ssl-cert	6f7d720c036362122b0bfb4461e56a11	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f57d1f728a5045043eb7301bf4b4cb05
diff --git a/metadata/md5-cache/www-servers/nginx-1.8.1 b/metadata/md5-cache/www-servers/nginx-1.8.1
index 534061d537ab..c91897b4486b 100644
--- a/metadata/md5-cache/www-servers/nginx-1.8.1
+++ b/metadata/md5-cache/www-servers/nginx-1.8.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=pcre? ( >=dev-libs/libpcre-4.2 ) pcre-jit? ( >=dev-libs/libpcre-8.20[jit] ) ssl? ( dev-libs/openssl:0= ) http-cache? ( userland_GNU? ( dev-libs/openssl:0= ) ) nginx_modules_http_geoip? ( dev-libs/geoip ) nginx_modules_http_gunzip? ( sys-libs/zlib ) nginx_modules_http_gzip? ( sys-libs/zlib ) nginx_modules_http_gzip_static? ( sys-libs/zlib ) nginx_modules_http_image_filter? ( media-libs/gd[jpeg,png] ) nginx_modules_http_perl? ( >=dev-lang/perl-5.8 ) nginx_modules_http_rewrite? ( >=dev-libs/libpcre-4.2 ) nginx_modules_http_secure_link? ( userland_GNU? ( dev-libs/openssl:0= ) ) nginx_modules_http_spdy? ( >=dev-libs/openssl-1.0.1c:0= ) nginx_modules_http_xslt? ( dev-libs/libxml2 dev-libs/libxslt ) nginx_modules_http_lua? ( !luajit? ( dev-lang/lua:0= ) luajit? ( dev-lang/luajit:2= ) ) nginx_modules_http_auth_pam? ( virtual/pam ) nginx_modules_http_metrics? ( dev-libs/yajl ) nginx_modules_http_dav_ext? ( dev-libs/expat ) nginx_modules_http_security? ( >=dev-libs/libxml2-2.7.8 dev-libs/apr-util www-servers/apache ) arm? ( dev-libs/libatomic_ops ) libatomic? ( dev-libs/libatomic_ops ) ssl? ( dev-libs/openssl:0= ) virtual/pkgconfig
+DEPEND=pcre? ( >=dev-libs/libpcre-4.2 ) pcre-jit? ( >=dev-libs/libpcre-8.20[jit] ) ssl? ( dev-libs/openssl:0= ) http-cache? ( userland_GNU? ( dev-libs/openssl:0= ) ) nginx_modules_http_geoip? ( dev-libs/geoip ) nginx_modules_http_gunzip? ( sys-libs/zlib ) nginx_modules_http_gzip? ( sys-libs/zlib ) nginx_modules_http_gzip_static? ( sys-libs/zlib ) nginx_modules_http_image_filter? ( media-libs/gd[jpeg,png] ) nginx_modules_http_perl? ( >=dev-lang/perl-5.8 ) nginx_modules_http_rewrite? ( >=dev-libs/libpcre-4.2 ) nginx_modules_http_secure_link? ( userland_GNU? ( dev-libs/openssl:0= ) ) nginx_modules_http_spdy? ( >=dev-libs/openssl-1.0.1c:0= ) nginx_modules_http_xslt? ( dev-libs/libxml2 dev-libs/libxslt ) nginx_modules_http_lua? ( !luajit? ( dev-lang/lua:0= ) luajit? ( dev-lang/luajit:2= ) ) nginx_modules_http_auth_pam? ( virtual/pam ) nginx_modules_http_metrics? ( dev-libs/yajl ) nginx_modules_http_dav_ext? ( dev-libs/expat ) nginx_modules_http_security? ( >=dev-libs/libxml2-2.7.8 dev-libs/apr-util www-servers/apache ) arm? ( dev-libs/libatomic_ops ) libatomic? ( dev-libs/libatomic_ops ) ssl? ( dev-libs/openssl:0 ) virtual/pkgconfig
 DESCRIPTION=Robust, small and high performance http and reverse proxy server
 EAPI=5
 HOMEPAGE=http://nginx.org
@@ -11,5 +11,5 @@ RDEPEND=pcre? ( >=dev-libs/libpcre-4.2 ) pcre-jit? ( >=dev-libs/libpcre-8.20[jit
 REQUIRED_USE=pcre-jit? ( pcre ) nginx_modules_http_lua? ( nginx_modules_http_rewrite ) nginx_modules_http_naxsi? ( pcre ) nginx_modules_http_dav_ext? ( nginx_modules_http_dav ) nginx_modules_http_metrics? ( nginx_modules_http_stub_status ) nginx_modules_http_security? ( pcre ) nginx_modules_http_push_stream? ( ssl )
 SLOT=0
 SRC_URI=http://nginx.org/download/nginx-1.8.1.tar.gz https://github.com/simpl/ngx_devel_kit/archive/v0.2.19.tar.gz -> ngx_devel_kit-0.2.19-r1.tar.gz nginx_modules_http_upload_progress? ( https://github.com/masterzen/nginx-upload-progress-module/archive/v0.9.1.tar.gz -> ngx_http_upload_progress-0.9.1-r1.tar.gz ) nginx_modules_http_headers_more? ( https://github.com/agentzh/headers-more-nginx-module/archive/v0.26.tar.gz -> ngx_http_headers_more-0.26.tar.gz ) nginx_modules_http_cache_purge? ( http://labs.frickle.com/files/ngx_cache_purge-2.3.tar.gz -> ngx_http_cache_purge-2.3.tar.gz ) nginx_modules_http_slowfs_cache? ( http://labs.frickle.com/files/ngx_slowfs_cache-1.10.tar.gz -> ngx_http_slowfs_cache-1.10.tar.gz ) nginx_modules_http_fancyindex? ( https://github.com/aperezdc/ngx-fancyindex/archive/v0.3.5.tar.gz -> ngx_http_fancyindex-0.3.5.tar.gz ) nginx_modules_http_lua? ( https://github.com/openresty/lua-nginx-module/archive/v0.9.15.tar.gz -> ngx_http_lua-0.9.15.tar.gz ) nginx_modules_http_auth_pam? ( https://github.com/stogh/ngx_http_auth_pam_module/archive/v1.4.tar.gz -> ngx_http_auth_pam-1.4.tar.gz ) nginx_modules_http_upstream_check? ( https://github.com/yaoweibin/nginx_upstream_check_module/archive/v0.3.0.tar.gz -> ngx_http_upstream_check-0.3.0.tar.gz ) nginx_modules_http_metrics? ( https://github.com/madvertise/ngx_metrics/archive/v0.1.1.tar.gz -> ngx_metrics-0.1.1.tar.gz ) nginx_modules_http_naxsi? ( https://github.com/nbs-system/naxsi/archive/0.53-2.tar.gz -> ngx_http_naxsi-0.53-2.tar.gz ) rtmp? ( https://github.com/arut/nginx-rtmp-module/archive/v1.1.7.tar.gz -> ngx_rtmp-1.1.7.tar.gz ) nginx_modules_http_dav_ext? ( https://github.com/arut/nginx-dav-ext-module/archive/v0.0.3.tar.gz -> ngx_http_dav_ext-0.0.3.tar.gz ) nginx_modules_http_echo? ( https://github.com/agentzh/echo-nginx-module/archive/v0.57.tar.gz -> ngx_http_echo-0.57.tar.gz ) nginx_modules_http_security? ( https://www.modsecurity.org/tarball/2.9.0/modsecurity-2.9.0.tar.gz -> modsecurity-2.9.0.tar.gz ) nginx_modules_http_push_stream? ( https://github.com/wandenberg/nginx-push-stream-module/archive/0.4.1.tar.gz -> ngx_http_push_stream-0.4.1.tar.gz ) nginx_modules_http_sticky? ( https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng/get/1.2.5.tar.bz2 -> nginx_http_sticky_module_ng-1.2.5.tar.bz2 ) nginx_modules_http_mogilefs? ( http://www.grid.net.ru/nginx/download/nginx_mogilefs_module-1.0.4.tar.gz -> ngx_mogilefs_module-1.0.4.tar.gz )
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	23ae8c186171e6476af098d2a50d0ee0	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	461f1d9eb930e8d1b178a39e83635fd0	ssl-cert	b29ef3f715f3a76f1bf807b7e8751096	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	unpacker	45d07319df5f40ee6af58418b0f930be	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	23ae8c186171e6476af098d2a50d0ee0	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	461f1d9eb930e8d1b178a39e83635fd0	ssl-cert	6f7d720c036362122b0bfb4461e56a11	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	unpacker	45d07319df5f40ee6af58418b0f930be	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=dabb0d0e2e9bf0ff622e4e6584beb8cd
diff --git a/metadata/md5-cache/www-servers/nginx-1.9.12 b/metadata/md5-cache/www-servers/nginx-1.9.12
index 4d30af0e86b8..a7a11391e807 100644
--- a/metadata/md5-cache/www-servers/nginx-1.9.12
+++ b/metadata/md5-cache/www-servers/nginx-1.9.12
@@ -11,5 +11,5 @@ RDEPEND=pcre? ( >=dev-libs/libpcre-4.2 ) pcre-jit? ( >=dev-libs/libpcre-8.20[jit
 REQUIRED_USE=pcre-jit? ( pcre ) nginx_modules_http_lua? ( nginx_modules_http_rewrite ) nginx_modules_http_naxsi? ( pcre ) nginx_modules_http_dav_ext? ( nginx_modules_http_dav ) nginx_modules_http_metrics? ( nginx_modules_http_stub_status ) nginx_modules_http_security? ( pcre ) nginx_modules_http_push_stream? ( ssl )
 SLOT=mainline
 SRC_URI=http://nginx.org/download/nginx-1.9.12.tar.gz https://github.com/simpl/ngx_devel_kit/archive/v0.2.19.tar.gz -> ngx_devel_kit-0.2.19-r1.tar.gz nginx_modules_http_upload_progress? ( https://github.com/masterzen/nginx-upload-progress-module/archive/v0.9.1.tar.gz -> ngx_http_upload_progress-0.9.1-r1.tar.gz ) nginx_modules_http_headers_more? ( https://github.com/agentzh/headers-more-nginx-module/archive/v0.29.tar.gz -> ngx_http_headers_more-0.29.tar.gz ) nginx_modules_http_cache_purge? ( http://labs.frickle.com/files/ngx_cache_purge-2.3.tar.gz -> ngx_http_cache_purge-2.3.tar.gz ) nginx_modules_http_slowfs_cache? ( http://labs.frickle.com/files/ngx_slowfs_cache-1.10.tar.gz -> ngx_http_slowfs_cache-1.10.tar.gz ) nginx_modules_http_fancyindex? ( https://github.com/aperezdc/ngx-fancyindex/archive/v0.3.6.tar.gz -> ngx_http_fancyindex-0.3.6.tar.gz ) nginx_modules_http_lua? ( https://github.com/openresty/lua-nginx-module/archive/v0.10.1rc1.tar.gz -> ngx_http_lua-0.10.1rc1.tar.gz ) nginx_modules_http_auth_pam? ( https://github.com/stogh/ngx_http_auth_pam_module/archive/v1.4.tar.gz -> ngx_http_auth_pam-1.4.tar.gz ) nginx_modules_http_upstream_check? ( https://github.com/yaoweibin/nginx_upstream_check_module/archive/v0.3.0.tar.gz -> ngx_http_upstream_check-0.3.0.tar.gz ) nginx_modules_http_metrics? ( https://github.com/madvertise/ngx_metrics/archive/v0.1.1.tar.gz -> ngx_metrics-0.1.1.tar.gz ) nginx_modules_http_naxsi? ( https://github.com/nbs-system/naxsi/archive/0.54.tar.gz -> ngx_http_naxsi-0.54.tar.gz ) rtmp? ( https://github.com/arut/nginx-rtmp-module/archive/v1.1.7.tar.gz -> ngx_rtmp-1.1.7.tar.gz ) nginx_modules_http_dav_ext? ( https://github.com/arut/nginx-dav-ext-module/archive/v0.0.3.tar.gz -> ngx_http_dav_ext-0.0.3.tar.gz ) nginx_modules_http_echo? ( https://github.com/agentzh/echo-nginx-module/archive/v0.58.tar.gz -> ngx_http_echo-0.58.tar.gz ) nginx_modules_http_security? ( https://www.modsecurity.org/tarball/2.9.0/modsecurity-2.9.0.tar.gz -> modsecurity-2.9.0.tar.gz ) nginx_modules_http_push_stream? ( https://github.com/wandenberg/nginx-push-stream-module/archive/0.5.1.tar.gz -> ngx_http_push_stream-0.5.1.tar.gz ) nginx_modules_http_sticky? ( https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng/get/1.2.6.tar.bz2 -> nginx_http_sticky_module_ng-1.2.6.tar.bz2 ) nginx_modules_http_mogilefs? ( https://github.com/vkholodkov/nginx-mogilefs-module/archive/1.0.4.tar.gz -> ngx_mogilefs_module-1.0.4.tar.gz ) nginx_modules_http_memc? ( https://github.com/openresty/memc-nginx-module/archive/v0.16.tar.gz -> ngx_memc_module-0.16.tar.gz ) nginx_modules_http_auth_ldap? ( https://github.com/kvspb/nginx-auth-ldap/archive/8517bb05ecc896b54429ca5e95137b0a386bd41a.tar.gz -> nginx-auth-ldap-8517bb05ecc896b54429ca5e95137b0a386bd41a.tar.gz )
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	23ae8c186171e6476af098d2a50d0ee0	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	461f1d9eb930e8d1b178a39e83635fd0	ssl-cert	b29ef3f715f3a76f1bf807b7e8751096	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	23ae8c186171e6476af098d2a50d0ee0	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	461f1d9eb930e8d1b178a39e83635fd0	ssl-cert	6f7d720c036362122b0bfb4461e56a11	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=370bb13a5446990f32a630d2be533f86
diff --git a/metadata/md5-cache/www-servers/nginx-1.9.13 b/metadata/md5-cache/www-servers/nginx-1.9.13
index 8ab2819d6e37..1f7688f12052 100644
--- a/metadata/md5-cache/www-servers/nginx-1.9.13
+++ b/metadata/md5-cache/www-servers/nginx-1.9.13
@@ -11,5 +11,5 @@ RDEPEND=pcre? ( >=dev-libs/libpcre-4.2 ) pcre-jit? ( >=dev-libs/libpcre-8.20[jit
 REQUIRED_USE=pcre-jit? ( pcre ) nginx_modules_http_lua? ( nginx_modules_http_rewrite ) nginx_modules_http_naxsi? ( pcre ) nginx_modules_http_dav_ext? ( nginx_modules_http_dav ) nginx_modules_http_metrics? ( nginx_modules_http_stub_status ) nginx_modules_http_security? ( pcre ) nginx_modules_http_push_stream? ( ssl )
 SLOT=mainline
 SRC_URI=http://nginx.org/download/nginx-1.9.13.tar.gz https://github.com/simpl/ngx_devel_kit/archive/v0.2.19.tar.gz -> ngx_devel_kit-0.2.19-r1.tar.gz nginx_modules_http_upload_progress? ( https://github.com/masterzen/nginx-upload-progress-module/archive/v0.9.1.tar.gz -> ngx_http_upload_progress-0.9.1-r1.tar.gz ) nginx_modules_http_headers_more? ( https://github.com/agentzh/headers-more-nginx-module/archive/v0.29.tar.gz -> ngx_http_headers_more-0.29.tar.gz ) nginx_modules_http_cache_purge? ( http://labs.frickle.com/files/ngx_cache_purge-2.3.tar.gz -> ngx_http_cache_purge-2.3.tar.gz ) nginx_modules_http_slowfs_cache? ( http://labs.frickle.com/files/ngx_slowfs_cache-1.10.tar.gz -> ngx_http_slowfs_cache-1.10.tar.gz ) nginx_modules_http_fancyindex? ( https://github.com/aperezdc/ngx-fancyindex/archive/v0.3.6.tar.gz -> ngx_http_fancyindex-0.3.6.tar.gz ) nginx_modules_http_lua? ( https://github.com/openresty/lua-nginx-module/archive/v0.10.2.tar.gz -> ngx_http_lua-0.10.2.tar.gz ) nginx_modules_http_auth_pam? ( https://github.com/stogh/ngx_http_auth_pam_module/archive/v1.4.tar.gz -> ngx_http_auth_pam-1.4.tar.gz ) nginx_modules_http_upstream_check? ( https://github.com/yaoweibin/nginx_upstream_check_module/archive/v0.3.0.tar.gz -> ngx_http_upstream_check-0.3.0.tar.gz ) nginx_modules_http_metrics? ( https://github.com/madvertise/ngx_metrics/archive/v0.1.1.tar.gz -> ngx_metrics-0.1.1.tar.gz ) nginx_modules_http_naxsi? ( https://github.com/nbs-system/naxsi/archive/0.54.tar.gz -> ngx_http_naxsi-0.54.tar.gz ) rtmp? ( https://github.com/arut/nginx-rtmp-module/archive/v1.1.7.tar.gz -> ngx_rtmp-1.1.7.tar.gz ) nginx_modules_http_dav_ext? ( https://github.com/arut/nginx-dav-ext-module/archive/v0.0.3.tar.gz -> ngx_http_dav_ext-0.0.3.tar.gz ) nginx_modules_http_echo? ( https://github.com/agentzh/echo-nginx-module/archive/v0.58.tar.gz -> ngx_http_echo-0.58.tar.gz ) nginx_modules_http_security? ( https://www.modsecurity.org/tarball/2.9.1/modsecurity-2.9.1.tar.gz -> modsecurity-2.9.1.tar.gz ) nginx_modules_http_push_stream? ( https://github.com/wandenberg/nginx-push-stream-module/archive/0.5.1.tar.gz -> ngx_http_push_stream-0.5.1.tar.gz ) nginx_modules_http_sticky? ( https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng/get/1.2.6.tar.bz2 -> nginx_http_sticky_module_ng-1.2.6.tar.bz2 ) nginx_modules_http_mogilefs? ( https://github.com/vkholodkov/nginx-mogilefs-module/archive/1.0.4.tar.gz -> ngx_mogilefs_module-1.0.4.tar.gz ) nginx_modules_http_memc? ( https://github.com/openresty/memc-nginx-module/archive/v0.16.tar.gz -> ngx_memc_module-0.16.tar.gz ) nginx_modules_http_auth_ldap? ( https://github.com/kvspb/nginx-auth-ldap/archive/8517bb05ecc896b54429ca5e95137b0a386bd41a.tar.gz -> nginx-auth-ldap-8517bb05ecc896b54429ca5e95137b0a386bd41a.tar.gz )
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	23ae8c186171e6476af098d2a50d0ee0	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	461f1d9eb930e8d1b178a39e83635fd0	ssl-cert	b29ef3f715f3a76f1bf807b7e8751096	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	23ae8c186171e6476af098d2a50d0ee0	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	461f1d9eb930e8d1b178a39e83635fd0	ssl-cert	6f7d720c036362122b0bfb4461e56a11	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ba1c87ceb6eb0b1d6dfc6312ce8e2caa
diff --git a/metadata/md5-cache/www-servers/nginx-1.9.14 b/metadata/md5-cache/www-servers/nginx-1.9.14
index 0cd4a39990d6..5938c1ac82ac 100644
--- a/metadata/md5-cache/www-servers/nginx-1.9.14
+++ b/metadata/md5-cache/www-servers/nginx-1.9.14
@@ -11,5 +11,5 @@ RDEPEND=pcre? ( >=dev-libs/libpcre-4.2 ) pcre-jit? ( >=dev-libs/libpcre-8.20[jit
 REQUIRED_USE=pcre-jit? ( pcre ) nginx_modules_http_lua? ( nginx_modules_http_rewrite ) nginx_modules_http_naxsi? ( pcre ) nginx_modules_http_dav_ext? ( nginx_modules_http_dav ) nginx_modules_http_metrics? ( nginx_modules_http_stub_status ) nginx_modules_http_security? ( pcre ) nginx_modules_http_push_stream? ( ssl )
 SLOT=mainline
 SRC_URI=http://nginx.org/download/nginx-1.9.14.tar.gz https://github.com/simpl/ngx_devel_kit/archive/v0.2.19.tar.gz -> ngx_devel_kit-0.2.19-r1.tar.gz nginx_modules_http_upload_progress? ( https://github.com/masterzen/nginx-upload-progress-module/archive/v0.9.1.tar.gz -> ngx_http_upload_progress-0.9.1-r1.tar.gz ) nginx_modules_http_headers_more? ( https://github.com/agentzh/headers-more-nginx-module/archive/v0.29.tar.gz -> ngx_http_headers_more-0.29.tar.gz ) nginx_modules_http_cache_purge? ( http://labs.frickle.com/files/ngx_cache_purge-2.3.tar.gz -> ngx_http_cache_purge-2.3.tar.gz ) nginx_modules_http_slowfs_cache? ( http://labs.frickle.com/files/ngx_slowfs_cache-1.10.tar.gz -> ngx_http_slowfs_cache-1.10.tar.gz ) nginx_modules_http_fancyindex? ( https://github.com/aperezdc/ngx-fancyindex/archive/v0.3.6.tar.gz -> ngx_http_fancyindex-0.3.6.tar.gz ) nginx_modules_http_lua? ( https://github.com/openresty/lua-nginx-module/archive/v0.10.2.tar.gz -> ngx_http_lua-0.10.2.tar.gz ) nginx_modules_http_auth_pam? ( https://github.com/stogh/ngx_http_auth_pam_module/archive/v1.5.1.tar.gz -> ngx_http_auth_pam-1.5.1.tar.gz ) nginx_modules_http_upstream_check? ( https://github.com/yaoweibin/nginx_upstream_check_module/archive/v0.3.0.tar.gz -> ngx_http_upstream_check-0.3.0.tar.gz ) nginx_modules_http_metrics? ( https://github.com/madvertise/ngx_metrics/archive/v0.1.1.tar.gz -> ngx_metrics-0.1.1.tar.gz ) nginx_modules_http_naxsi? ( https://github.com/nbs-system/naxsi/archive/0.54.tar.gz -> ngx_http_naxsi-0.54.tar.gz ) rtmp? ( https://github.com/arut/nginx-rtmp-module/archive/v1.1.7.tar.gz -> ngx_rtmp-1.1.7.tar.gz ) nginx_modules_http_dav_ext? ( https://github.com/arut/nginx-dav-ext-module/archive/v0.0.3.tar.gz -> ngx_http_dav_ext-0.0.3.tar.gz ) nginx_modules_http_echo? ( https://github.com/agentzh/echo-nginx-module/archive/v0.58.tar.gz -> ngx_http_echo-0.58.tar.gz ) nginx_modules_http_security? ( https://www.modsecurity.org/tarball/2.9.1/modsecurity-2.9.1.tar.gz -> modsecurity-2.9.1.tar.gz ) nginx_modules_http_push_stream? ( https://github.com/wandenberg/nginx-push-stream-module/archive/0.5.1.tar.gz -> ngx_http_push_stream-0.5.1.tar.gz ) nginx_modules_http_sticky? ( https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng/get/1.2.6.tar.bz2 -> nginx_http_sticky_module_ng-1.2.6.tar.bz2 ) nginx_modules_http_mogilefs? ( https://github.com/vkholodkov/nginx-mogilefs-module/archive/1.0.4.tar.gz -> ngx_mogilefs_module-1.0.4.tar.gz ) nginx_modules_http_memc? ( https://github.com/openresty/memc-nginx-module/archive/v0.16.tar.gz -> ngx_memc_module-0.16.tar.gz ) nginx_modules_http_auth_ldap? ( https://github.com/kvspb/nginx-auth-ldap/archive/8517bb05ecc896b54429ca5e95137b0a386bd41a.tar.gz -> nginx-auth-ldap-8517bb05ecc896b54429ca5e95137b0a386bd41a.tar.gz )
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	23ae8c186171e6476af098d2a50d0ee0	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	461f1d9eb930e8d1b178a39e83635fd0	ssl-cert	b29ef3f715f3a76f1bf807b7e8751096	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	23ae8c186171e6476af098d2a50d0ee0	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	461f1d9eb930e8d1b178a39e83635fd0	ssl-cert	6f7d720c036362122b0bfb4461e56a11	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9a0067d609483310e152a28296283790
diff --git a/metadata/md5-cache/x11-misc/xplanet-1.3.1 b/metadata/md5-cache/x11-misc/xplanet-1.3.1
index 1fe2ab5065da..93c85d891c5d 100644
--- a/metadata/md5-cache/x11-misc/xplanet-1.3.1
+++ b/metadata/md5-cache/x11-misc/xplanet-1.3.1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=configure prepare
-DEPEND=gif? ( >media-libs/giflib-4.2 ) jpeg? ( virtual/jpeg:* ) png? ( media-libs/libpng:0 media-libs/netpbm ) tiff? ( media-libs/tiff:0 ) truetype? ( media-libs/freetype:2 x11-libs/pango ) X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXScrnSaver x11-libs/libXt ) truetype? ( virtual/pkgconfig ) X? ( x11-proto/scrnsaverproto x11-proto/xproto )
+DEPEND=gif? ( media-libs/giflib:= ) jpeg? ( virtual/jpeg:* ) png? ( media-libs/libpng:0 media-libs/netpbm ) tiff? ( media-libs/tiff:0 ) truetype? ( media-libs/freetype:2 x11-libs/pango ) X? ( x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXext x11-libs/libXt ) truetype? ( virtual/pkgconfig ) X? ( x11-proto/scrnsaverproto x11-proto/xproto )
 DESCRIPTION=Render images of the earth into the X root window
 EAPI=5
 HOMEPAGE=http://xplanet.sourceforge.net/
 IUSE=gif jpeg png tiff truetype X
 KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
-RDEPEND=gif? ( >media-libs/giflib-4.2 ) jpeg? ( virtual/jpeg:* ) png? ( media-libs/libpng:0 media-libs/netpbm ) tiff? ( media-libs/tiff:0 ) truetype? ( media-libs/freetype:2 x11-libs/pango ) X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXScrnSaver x11-libs/libXt )
+RDEPEND=gif? ( media-libs/giflib:= ) jpeg? ( virtual/jpeg:* ) png? ( media-libs/libpng:0 media-libs/netpbm ) tiff? ( media-libs/tiff:0 ) truetype? ( media-libs/freetype:2 x11-libs/pango ) X? ( x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXext x11-libs/libXt )
 SLOT=0
 SRC_URI=mirror://sourceforge/xplanet/xplanet-1.3.1.tar.gz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb
-_md5_=83f6f7b8f88d6d30cd615c31d6eab86d
+_md5_=7d1fc5204162a174bb92de2182781c32
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 598faa260929..ad5b5c458342 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Sat, 16 Apr 2016 20:09:25 +0000
+Sun, 17 Apr 2016 17:09:15 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index c9d686730737..0b93c1f4a97b 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Sat Apr 16 20:08:35 UTC 2016
+Sun Apr 17 17:08:25 UTC 2016
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index ae61ffad3125..b011991a812f 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Sat, 16 Apr 2016 20:30:01 +0000
+Sun, 17 Apr 2016 17:30:01 +0000
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 0e3c3067f9ee..7a2617aa2ddf 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1460837401 Sat 16 Apr 2016 08:10:01 PM UTC
+1460913002 Sun 17 Apr 2016 05:10:02 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 598faa260929..ad5b5c458342 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Sat, 16 Apr 2016 20:09:25 +0000
+Sun, 17 Apr 2016 17:09:15 +0000
diff --git a/net-mail/altermime/Manifest b/net-mail/altermime/Manifest
index 381a3e9d5300..790e592c4cec 100644
--- a/net-mail/altermime/Manifest
+++ b/net-mail/altermime/Manifest
@@ -1,3 +1 @@
-DIST altermime-0.3.10.tar.gz 85396 SHA256 8334da6b55d4a05dfe1492389dfe1f289953053a21773849b060d7c856ddc36e SHA512 8be68ef7451e08c39742193571be8fb537bbe68e494d2a1f1347a6a409ef81ef2fc119ab60d101f24ce566c588c471f7fc5ded2f3f9f9b5ed7e8b28ff1f5c29b WHIRLPOOL bb50b8cb50a4a411c03dbf89ccb37842aee38225aa81b56bec0e555c05f9857c545a669a0662b175f0b952ca888e31c7319d6037a33bb1a6ed0db84e6c03823a
 DIST altermime-0.3.11.tar.gz 90244 SHA256 0b1f18de400f3c30c2fef7f691f68a2fd3688a7e243d9fda8623fc5c207b2b97 SHA512 561e36398bafcd888e912b6291ec76ead881bac86a7d0b8072753012d4c4557e67f608a9d43c968c6521e5f35bdf7b98e2c73ab811dadaaf13dcefe35c2d9e68 WHIRLPOOL f21b723eff6f9092217a75971baee34145d8f659b000bc3aeccd416414d81bfa7fbbf52ed1e8290de38cd04dbc52f9e10982bd33fc8dc1e3bf3d53c5c179f958
-DIST altermime-0.3.7.tar.gz 76212 SHA256 643c573bceb2921ad4b8078e1eb7ac369d77e78499f95d95c7ba058cb42b43c9 SHA512 61af813bfe38b1af623b22693af43e077c5b63a9c0da687ac4afcb7b991a5efa05880d8b13dbc25d7e375e8c588308332af1e4a6747b840f09a2990fdcbbc19c WHIRLPOOL 81c4caa02af7cadd09530c075d3a3b11bf1017a59a8a0540584a318a4d9de20e12b0fdee2dc3dc02017457ab7217526461e1ff182a1c78d63999efc199e8a212
diff --git a/net-mail/altermime/altermime-0.3.10-r1.ebuild b/net-mail/altermime/altermime-0.3.10-r1.ebuild
deleted file mode 100644
index 2e4f76aaf12a..000000000000
--- a/net-mail/altermime/altermime-0.3.10-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=2
-inherit eutils toolchain-funcs
-
-DESCRIPTION=" alterMIME is a small program which is used to alter your mime-encoded mailpacks"
-SRC_URI="http://www.pldaniels.com/altermime/${P}.tar.gz"
-HOMEPAGE="http://pldaniels.com/altermime/"
-
-LICENSE="Sendmail"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-fprintf-fixes.patch \
-		"${FILESDIR}"/${P}-MIME_headers-overflow.patch \
-		"${FILESDIR}"/${P}-respect-flags.patch
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" || die
-}
-
-src_install () {
-	dobin altermime || die
-	dodoc CHANGELOG README || die
-}
diff --git a/net-mail/altermime/altermime-0.3.10.ebuild b/net-mail/altermime/altermime-0.3.10.ebuild
deleted file mode 100644
index 3c04765c382c..000000000000
--- a/net-mail/altermime/altermime-0.3.10.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=2
-inherit eutils toolchain-funcs
-
-DESCRIPTION=" alterMIME is a small program which is used to alter your mime-encoded mailpacks"
-SRC_URI="http://www.pldaniels.com/altermime/${P}.tar.gz"
-HOMEPAGE="http://pldaniels.com/altermime/"
-
-LICENSE="Sendmail"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-src_prepare() {
-	sed -i \
-		-e 's:-Werror::' \
-		-e "/^CFLAGS[[:space:]]*=/ s/-O2/${CFLAGS}/" \
-		-e 's/${CFLAGS} altermime.c/${CFLAGS} ${LDFLAGS} altermime.c/' \
-		Makefile || die
-
-	epatch "${FILESDIR}"/${P}-fprintf-fixes.patch \
-		"${FILESDIR}"/${P}-MIME_headers-overflow.patch
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" || die
-}
-
-src_install () {
-	dobin altermime || die
-	dodoc CHANGELOG README || die
-}
diff --git a/net-mail/altermime/altermime-0.3.7.ebuild b/net-mail/altermime/altermime-0.3.7.ebuild
deleted file mode 100644
index 846ec0d219bd..000000000000
--- a/net-mail/altermime/altermime-0.3.7.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit toolchain-funcs
-
-DESCRIPTION=" alterMIME is a small program which is used to alter your mime-encoded mailpacks"
-SRC_URI="http://www.pldaniels.com/altermime/${P}.tar.gz"
-HOMEPAGE="http://pldaniels.com/altermime/"
-
-LICENSE="Sendmail"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-SLOT="0"
-
-src_unpack() {
-	unpack ${A}
-	sed -i -e "/^CFLAGS[[:space:]]*=/ s/-O2/${CFLAGS}/" \
-		-e 's/${CFLAGS} altermime.c/${CFLAGS} ${LDFLAGS} altermime.c/' \
-		"${S}"/Makefile || die "sed failed."
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" || die "emake failed."
-}
-
-src_install () {
-	dobin altermime || die "dobin failed."
-	dodoc CHANGELOG LICENCE README || die "dodoc failed."
-}
diff --git a/net-mail/dot-forward/dot-forward-0.71-r2.ebuild b/net-mail/dot-forward/dot-forward-0.71-r2.ebuild
deleted file mode 100644
index ed4bd858b71d..000000000000
--- a/net-mail/dot-forward/dot-forward-0.71-r2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit eutils toolchain-funcs user
-
-DESCRIPTION="reads sendmail's .forward files under qmail"
-HOMEPAGE="http://cr.yp.to/dot-forward.html"
-SRC_URI="http://cr.yp.to/software/${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
-IUSE=""
-
-# See bug 97850
-RESTRICT="test"
-
-DEPEND=""
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	cd ${S}
-	epatch ${FILESDIR}/${PV}-errno.patch
-	epatch ${FILESDIR}/${PV}-head-1.patch
-
-	echo "$(tc-getCC) ${CFLAGS}" > conf-cc
-	echo "$(tc-getCC)" > conf-ld
-}
-
-src_compile() {
-	emake prog || die
-}
-
-src_install() {
-	dodoc BLURB CHANGES FILES INSTALL README SYSDEPS TARGETS THANKS
-	dodoc TODO VERSION
-	doman *.1
-
-	insopts -o root -g qmail -m 755
-	insinto /var/qmail/bin
-	doins dot-forward || die
-}
-
-pkg_setup() {
-	# keep in sync with mini-qmail pkg
-	einfo "Creating qmail group"
-	enewgroup qmail 201
-}
diff --git a/net-mail/mlmmj/Manifest b/net-mail/mlmmj/Manifest
index 17425455e818..38e290242767 100644
--- a/net-mail/mlmmj/Manifest
+++ b/net-mail/mlmmj/Manifest
@@ -1,4 +1,3 @@
-DIST mlmmj-1.2.17.1.tar.bz2 206041 SHA256 45a93fe5c8fc8f987bd3f5b512aea895b7ce6e5c6ccd902d65fec78eeaf56c93 SHA512 4fe0921bb0fa0903e61cffca2b360ae811a186956fee280537c3104caf3efc83a72f57f8fd048b3c2a0da9006f7278d67bc497e2092f6230328cf68560d83b70 WHIRLPOOL dd5bfc91067fc209b485470212e6f63f59c6f49e54c43c19034a88960e526d1e0085eeb21908e8507b35d6cc6a992b198f324c9676571a93310cea200ae71287
 DIST mlmmj-1.2.18.0.tar.bz2 240571 SHA256 6b7072d6f899fcbc8e5d04373e80bb71ffd9c896355285a713630d5f1eeb3341 SHA512 f40fbb8a8ee5312ac6d6baa32065205b768b1ad2a16b8622e6316723d64ceb118cd6d3c0f64929d610596433e1ccb1082c23ea8ad69ca004a6b563da72bd8cc6 WHIRLPOOL 4cbb74866a0351cb2f2b132da18337095da6c79dca96ffc82e5fdbcc56cbd41e49826b83ff5551078b1cbec7ec542970ad4a0b9c9c2c53166a4bafab55eaac22
 DIST mlmmj-1.2.18.1.tar.bz2 240942 SHA256 43d85fbed9bea31728f0c600fd277e553a24ff3bb5d2317a918cf3def87f91ca SHA512 755af623054daac31dfb3de20c017422c40f7fed42c141c5d398c2bd4d5deb8975db556af53f3e5e0711a83a260d7bf3017e27c4fd399a792190de683c470b72 WHIRLPOOL 50c3233950e1a94efe6d528e9684bea3c109f2e12afe292a51bbc2dbb77d9941a942a97955c8880b850043263fa2db02eb4bc794f5d3bd3001bd2444145cea9a
 DIST mlmmj-1.2.19.0.tar.bz2 284701 SHA256 3bcd7f5a17234ef570836f043ea4aacfdaf47d542c4ad4cbe4b2293c3bdb3cde SHA512 c0f23b434941bfb5bfcb9a0f292edcfa62c9bb357014d41f82b03bd8ed1a951e3c8f09293dd333030b024d3da82c514de789b8916cc3c0f493ad8fefbe3a3afb WHIRLPOOL cf68b8718157fb5e21380dd81aa0a8970726232d4026ee75439228a108ec8dfffb1e4673041d1f9dffd27b9b53ce21312af410a7b9a7799e20cde968facb7b17
diff --git a/net-mail/mlmmj/mlmmj-1.2.17.1.ebuild b/net-mail/mlmmj/mlmmj-1.2.17.1.ebuild
deleted file mode 100644
index 94b5b700c525..000000000000
--- a/net-mail/mlmmj/mlmmj-1.2.17.1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit eutils
-
-MY_PV="${PV/_rc/-RC}"
-MY_P="${PN}-${MY_PV}"
-DESCRIPTION="Mailing list managing made joyful"
-HOMEPAGE="http://mlmmj.org/"
-SRC_URI="http://mlmmj.org/releases/${MY_P}.tar.bz2"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-DEPEND="virtual/mta"
-#RDEPEND=""
-S="${WORKDIR}/${MY_P}"
-SHAREDIR="/usr/share/mlmmj"
-
-src_unpack() {
-	unpack ${A}
-	#epatch "${FILESDIR}"/${PN}-1.2.16-requeue-unlink-fix.patch
-	#epatch "${FILESDIR}"/${PN}-1.2.16-unsub-digest-text.patch
-	cd "${S}"
-	for i in "${S}" "${S}"/contrib/recievestrip ; do
-		pushd "${i}"
-		# Ignore errors
-		emake -j1 distclean 2>/dev/null 1>/dev/null
-		popd
-	done
-}
-
-src_compile() {
-	econf
-	emake || die
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-
-	dodir ${SHAREDIR}
-	dodir ${SHAREDIR}/texts
-	insinto ${SHAREDIR}/texts
-	doins listtexts/*
-
-	dodoc AUTHORS ChangeLog FAQ README
-	dodoc TODO TUNABLES UPGRADE VERSION README.access
-	dodoc README.sendmail README.exim4 README.security
-
-	insinto /usr/share/mlmmj
-	cd "${S}"/contrib/web
-	doins -r *
-
-	dobin "${S}"/contrib/recievestrip
-}
-
-pkg_postinst() {
-	elog "mlmmj comes with serveral webinterfaces:"
-	elog "- One for user subscribing/unsubscribing"
-	elog "- One for admin tasks"
-	elog "both available in a php and perl module."
-	elog "For more info have a look in /usr/share/mlmmj"
-}
diff --git a/net-mail/vchkuser/Manifest b/net-mail/vchkuser/Manifest
index 52a7e0723d8f..26b861a5d86c 100644
--- a/net-mail/vchkuser/Manifest
+++ b/net-mail/vchkuser/Manifest
@@ -1,2 +1 @@
-DIST vchkuser-0.3.3.tar.bz2 6057 SHA256 a104a5ca6fc091a0d255d3eac20b4670f28b75285323fdf27fc98bdd6d53cadf SHA512 866235abf0ed0b0775d41085b37d3827908f47d0b0c039ae8239c99b56dc8e395475b98baeafa17b63160639e57d15d7ad724e1f22cd2ea492774d1a0d82969f WHIRLPOOL 18a84a83542b1a7259777eec7f1eb62a6e5593c227f678f574c39d0a104dff3595fac454dfe2de2a4a304d7a03959e53cbbe7c13155c5f467dcccdd1121b732a
 DIST vchkuser-0.4.tar.gz 5890 SHA256 314cf937e24b6460ca816fde0d25119054ef880373151082e913aeccf9f92edd SHA512 3c33a1c26abeaf45ca90ac1f1c9cf7b1ae6eba3f6e5a8d0d8d0d12dce98fbada4209cd916af7af69d7682c174d88741b1140e5c758a08e0d196e73f2b6145699 WHIRLPOOL d33f2305c2fc5802f6cd6cccebf679df01e5626bc72d05523eb5405cd9b291d1a4dac866fd8bfd7606a93e68b9de6d9acd64395cd08fcf5dbc0be52cc9787f45
diff --git a/net-mail/vchkuser/vchkuser-0.3.3.ebuild b/net-mail/vchkuser/vchkuser-0.3.3.ebuild
deleted file mode 100644
index 860330b2cfd7..000000000000
--- a/net-mail/vchkuser/vchkuser-0.3.3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="2"
-
-inherit autotools qmail
-
-DESCRIPTION="qmail-spp plugin to check recipient existance with vpopmail"
-HOMEPAGE="https://github.com/hollow/vchkuser"
-SRC_URI="http://bb.xnull.de/projects/vchkuser/dist/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-DEPEND="net-mail/vpopmail
-	|| ( mail-mta/netqmail[qmail-spp] mail-mta/qmail-ldap[qmail-spp] )"
-RDEPEND=""
-
-src_prepare() {
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable debug) \
-		--with-vpopuser=vpopmail \
-		--with-qmailgroup=nofiles \
-		--with-vpopmaildir=/var/vpopmail \
-		--with-qmaildir=${QMAIL_HOME}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake failed"
-	fowners vpopmail:nofiles "${QMAIL_HOME}"/plugins/vchkuser
-	fperms 4750 "${QMAIL_HOME}"/plugins/vchkuser
-}
diff --git a/net-mail/vpopmail/Manifest b/net-mail/vpopmail/Manifest
index 80fd5b44ad67..e3fff7920a4a 100644
--- a/net-mail/vpopmail/Manifest
+++ b/net-mail/vpopmail/Manifest
@@ -1,3 +1 @@
-DIST vpopmail-5.4.16.tar.gz 453019 SHA256 c1ea76e404082a116795dc3c49933b26f79cdbb49bca5ebc4fa170403a5e3c7a SHA512 a7ce5640a59ee7f216869d08cb681eb323910f4fd7dcc9f644fe9bcb842c6703745edbbd5bb95ab44dc59b4684a8e29b115a3aeb893ef7514fdc28eab46328d0 WHIRLPOOL 10bc8c4f05b11cabaaf69e49f42006bd8b46d671f189c4e5d8258e3fb88bffb76e086398792dc655b3a02d6f59efcb48727602b50273138a3b35940725faeba3
-DIST vpopmail-5.4.30.tar.gz 609358 SHA256 38239ca6f9dda25f70cc46106f3ffe8b9d3b95907ced54c15eb942c2ff387acc SHA512 62bb677cb2f928d37fff1346a7aa7a6f9f7900159d1edcf0f471bf252c59f19e2b8605c27033e9123339a75dc4058b4fd21ea5e05684590e50c94a1431d91c7b WHIRLPOOL 0a4caafe23dd649e6c5917bac6fa414dd702b8631231c94385a2afc24e977b3ea07e6cdf71261935e4a7df2e7508edad40124c15cfab2e02308c060c5d50e44a
 DIST vpopmail-5.4.33.tar.gz 612271 SHA256 383c7436dfb18e773336f608f1771fc08559143c4f3938a5807a0cc5994c44f4 SHA512 abd5060d709c661d95ca442c6f77c4c27cf30a3c6790fc36d76ccf379ed2e08c1f0af697b2bcc57176a2cdb2cb67f6c27236d7b3fa69a135fa87f45a5df208ab WHIRLPOOL 9b49635984e541880528e56da9932a74e1a0988ef0b82f0f15538b6f9744c3bf1e86da45dd5de0c55af714669547c48d1f13830c8480e6760bc548b5047520f3
diff --git a/net-mail/vpopmail/vpopmail-5.4.16.ebuild b/net-mail/vpopmail/vpopmail-5.4.16.ebuild
deleted file mode 100644
index 920037acc8da..000000000000
--- a/net-mail/vpopmail/vpopmail-5.4.16.ebuild
+++ /dev/null
@@ -1,246 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit eutils fixheadtails autotools user
-
-# TODO: all ldap, sybase support
-#MY_PV=${PV/_/-}
-#MY_P=${PN}-${MY_PV}
-HOMEPAGE="http://www.inter7.com/index.php?page=vpopmail"
-DESCRIPTION="A collection of programs to manage virtual email domains and accounts on your Qmail mail servers"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm hppa ~ia64 ppc s390 sh sparc x86"
-IUSE="mysql ipalias clearpasswd"
-# vpopmail will NOT build if non-root.
-RESTRICT="userpriv"
-
-DEPEND_COMMON="virtual/qmail
-	mysql? ( virtual/mysql )"
-DEPEND="sys-apps/sed
-	sys-apps/ucspi-tcp
-	${DEPEND_COMMON}"
-RDEPEND="${DEPEND_COMMON}
-	virtual/cron"
-
-# S="${WORKDIR}/${MY_P}"
-
-# Define vpopmail home dir in /etc/password if different
-VPOP_DEFAULT_HOME="/var/vpopmail"
-VPOP_HOME="$VPOP_DEFAULT_HOME"
-
-# This makes sure the variable is set, and that it isn't null.
-vpopmail_set_homedir() {
-	VPOP_HOME=$(egethome vpopmail)
-	if [ -z "$VPOP_HOME" ]; then
-		echo -ne "\a"
-		eerror "vpopmail's home directory is null in passwd data!"
-		eerror "You probably want to check that out."
-		eerror "Continuing with default."
-		VPOP_HOME="${VPOP_DEFAULT_HOME}"
-	else
-		einfo "Setting VPOP_HOME to: $VPOP_HOME"
-	fi
-}
-
-pkg_setup() {
-	enewgroup vpopmail 89
-	enewuser vpopmail 89 -1 ${VPOP_DEFAULT_HOME} vpopmail
-	upgradewarning
-}
-
-src_unpack() {
-	# cd ${WORKDIR}
-	# unpack ${MY_P}.tar.gz
-	unpack ${A}
-	cd ${S}
-
-	epatch ${FILESDIR}/${PN}-5.4.9-access.violation.patch || die "failed to patch."
-	epatch ${FILESDIR}/${PN}-lazy.patch || die "failed to patch."
-
-	sed -i \
-		's|Maildir|.maildir|g' \
-		vchkpw.c vconvert.c vdelivermail.c \
-		vpopbull.c vpopmail.c vqmaillocal.c \
-		vuserinfo.c maildirquota.c \
-		|| die "failed to change Maildir to .maildir"
-	sed -i \
-		'/printf.*vpopmail/s:vpopmail (:(:' \
-		vdelivermail.c vpopbull.c vqmaillocal.c \
-		|| die "failed to remove vpopmail advertisement"
-
-	eautoreconf
-	ht_fix_file ${S}/cdb/Makefile || die "failed to fix file"
-}
-
-src_compile() {
-	vpopmail_set_homedir
-
-	use ipalias \
-		&& myopts="${myopts} --enable-ip-alias-domains=y" \
-		|| myopts="${myopts} --enable-ip-alias-domains=n"
-
-	use mysql \
-		&& myopts="${myopts} --enable-auth-module=mysql \
-			--enable-libs=/usr/include/mysql \
-			--enable-libdir=/usr/lib/mysql \
-			--enable-sql-logging=y \
-			--enable-auth-logging=y \
-			--enable-valias=y \
-			--enable-mysql-replication=n \
-			--enable-mysql-limits"
-
-	# Bug 20127
-	use clearpasswd \
-		&& myopts="${myopts} --enable-clear-passwd=y" \
-		|| myopts="${myopts} --enable-clear-passwd=n"
-
-	econf \
-		${myopts} \
-		--sbindir=/usr/sbin \
-		--bindir=/usr/bin \
-		--sysconfdir=${VPOP_HOME}/etc \
-		--enable-qmaildir=/var/qmail \
-		--enable-qmail-newu=/var/qmail/bin/qmail-newu \
-		--enable-qmail-inject=/var/qmail/bin/qmail-inject \
-		--enable-qmail-newmrh=/var/qmail/bin/qmail-newmrh \
-		--enable-vpopuser=vpopmail \
-		--enable-many-domains=y \
-		--enable-vpopgroup=vpopmail \
-		--enable-file-locking=y \
-		--enable-file-sync=y \
-		--enable-md5-passwords=y \
-		--enable-logging=y \
-		--enable-log-name=vpopmail \
-		--enable-qmail-ext \
-		--disable-tcp-rules-prog --disable-tcpserver-file --disable-roaming-users \
-		|| die
-
-	# TCPRULES for relaying is now considered obsolete, use relay-ctrl instead
-	#--enable-tcprules-prog=/usr/bin/tcprules --enable-tcpserver-file=/etc/tcp.smtp \
-	#--enable-roaming-users=y --enable-relay-clear-minutes=60 \
-	#--disable-rebuild-tcpserver-file \
-
-	emake || die "Make failed."
-}
-
-src_install() {
-	vpopmail_set_homedir
-
-	make DESTDIR=${D} install || die
-	dosed ${VPOP_HOME}/etc/inc_deps
-	dosed ${VPOP_HOME}/etc/lib_deps
-
-	into /var/vpopmail
-	dobin ${FILESDIR}/vpopmail-Maildir-dotmaildir-fix.sh
-	into /usr
-
-	# Install documentation.
-	dodoc AUTHORS ChangeLog FAQ INSTALL README*
-	dodoc doc/doc_html/* doc/man_html/*
-	rm -rf ${D}/${VPOP_HOME}/doc
-	dosym /usr/share/doc/${PF}/ ${VPOP_HOME}/doc
-
-	# Create /etc/vpopmail.conf
-	if use mysql ; then
-		einfo "Installing vpopmail mysql configuration file"
-		dodir /etc
-		#config file position
-		mv ${D}/var/vpopmail/etc/vpopmail.mysql ${D}/etc/vpopmail.conf
-		dosym /etc/vpopmail.conf /var/vpopmail/etc/vpopmail.mysql
-		sed -e '12d' -i ${D}/etc/vpopmail.conf
-		echo '# Read-only DB' >>${D}/etc/vpopmail.conf
-		echo 'localhost|0|vpopmail|secret|vpopmail' >>${D}/etc/vpopmail.conf
-		echo '# Write DB' >>${D}/etc/vpopmail.conf
-		echo 'localhost|0|vpopmail|secret|vpopmail' >>${D}/etc/vpopmail.conf
-		# lock down perms
-		fperms 640 /etc/vpopmail.conf
-		fowners root:vpopmail /etc/vpopmail.conf
-	fi
-
-	# Install a proper cronjob instead of the old nastiness
-	#einfo "Installing cronjob"
-	#dodir /etc/cron.hourly
-	#insinto /etc/cron.hourly
-	#doins ${FILESDIR}/vpopmail.clearopensmtp
-	#fperms +x /etc/cron.hourly/vpopmail.clearopensmtp
-
-	einfo "Installing env.d entry"
-	dodir /etc/env.d
-	doenvd ${FILESDIR}/99vpopmail
-
-	# Configure b0rked. We'll do this manually
-	#echo "-I${VPOP_HOME}/include" > ${D}/${VPOP_HOME}/etc/inc_deps
-	#local libs_extra
-	#use mysql && libs_extra="-L/usr/lib/mysql -lmysqlclient -lz" || libs_extra=""
-	#echo "-L${VPOP_HOME}/lib -lvpopmail ${libs_extra}" > ${D}/${VPOP_HOME}/etc/lib_deps
-
-	einfo "Locking down vpopmail permissions"
-	# secure things more, i don't want the vpopmail user being able to write this stuff!
-	chown -R root:0 ${D}${VPOP_HOME}/{bin,etc,include}
-	chown root:vpopmail ${D}${VPOP_HOME}/bin/vchkpw
-	chmod 4711 ${D}${VPOP_HOME}/bin/vchkpw
-}
-
-pkg_preinst() {
-	vpopmail_set_homedir
-
-	# Keep DATA
-	keepdir ${VPOP_HOME}/domains
-
-	# This is a workaround until portage handles binary packages+users better.
-	pkg_setup
-
-	upgradewarning
-}
-
-pkg_postinst() {
-	einfo "Performing post-installation routines for ${P}."
-
-	if use mysql ; then
-		echo
-		elog "You have 'mysql' turned on in your USE"
-		elog "Vpopmail needs a VALID MySQL USER. Let's call it 'vpopmail'"
-		elog "You MUST add it and then specify its passwd in the /etc/vpopmail.conf file"
-		elog
-		elog "First log into mysql as your mysql root user and pass. Then:"
-		elog "> create database vpopmail;"
-		elog "> use mysql;"
-		elog "> grant select, insert, update, delete, create, drop on vpopmail.* to"
-		elog "	 vpopmail@localhost identified by 'your password';"
-		elog "> flush privileges;"
-		elog
-		elog "If you have problems with vpopmail not accepting mail properly,"
-		elog "please ensure that /etc/vpopmail.conf is chmod 640 and"
-		elog "owned by root:vpopmail"
-	fi
-	# do this for good measure
-	if [ -e /etc/vpopmail.conf ] ; then
-		chmod 640 /etc/vpopmail.conf
-		chown root:vpopmail /etc/vpopmail.conf
-	fi
-
-	upgradewarning
-}
-
-pkg_postrm() {
-	vpopmail_set_homedir
-
-	elog "The vpopmail DATA will NOT be removed automatically."
-	elog "You can delete them manually by removing the ${VPOP_HOME} directory."
-}
-
-upgradewarning() {
-	ewarn "Massive important warning if you are upgrading to 5.2.1-r8 or older"
-	ewarn "The internal structure of the mail storage has changed for"
-	ewarn "consistancy with the rest of Gentoo! Please review and utilize the "
-	ewarn "script at /var/vpopmail/bin/vpopmail-Maildir-dotmaildir-fix.sh"
-	ewarn "to upgrade your system! (It can do conversions both ways)."
-	ewarn "You should be able to run it right away without any changes."
-	echo
-	einfo "Use of vpopmail's tcp.smtp[.cdb] is also deprecated now, consider"
-	einfo "using net-mail/relay-ctrl instead."
-}
diff --git a/net-mail/vpopmail/vpopmail-5.4.30-r1.ebuild b/net-mail/vpopmail/vpopmail-5.4.30-r1.ebuild
deleted file mode 100644
index 87b31973dc8e..000000000000
--- a/net-mail/vpopmail/vpopmail-5.4.30-r1.ebuild
+++ /dev/null
@@ -1,231 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="2"
-
-inherit autotools eutils fixheadtails qmail user
-
-HOMEPAGE="http://www.inter7.com/index.php?page=vpopmail"
-DESCRIPTION="A collection of programs to manage virtual email domains and accounts on your Qmail mail servers"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm hppa ia64 ppc s390 sh sparc x86"
-IUSE="clearpasswd ipalias maildrop mysql"
-
-DEPEND="virtual/qmail
-	maildrop? ( mail-filter/maildrop )
-	mysql? ( virtual/mysql )"
-RDEPEND="${DEPEND}"
-
-# This makes sure the variable is set, and that it isn't null.
-VPOP_DEFAULT_HOME="/var/vpopmail"
-
-vpopmail_set_homedir() {
-	VPOP_HOME=$(egethome vpopmail)
-	if [[ -z "${VPOP_HOME}" ]]; then
-		ebeep
-		eerror "vpopmail's home directory is null in passwd data!"
-		eerror "You probably want to check that out."
-		eerror "Continuing with default."
-		VPOP_HOME="${VPOP_DEFAULT_HOME}"
-	else
-		einfo "Setting VPOP_HOME to: $VPOP_HOME"
-	fi
-}
-
-pkg_setup() {
-	enewgroup vpopmail 89
-	enewuser vpopmail 89 -1 ${VPOP_DEFAULT_HOME} vpopmail
-	upgradewarning
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-5.4.9-access.violation.patch
-	epatch "${FILESDIR}"/${PN}-lazy.patch
-	epatch "${FILESDIR}"/${PN}-double-free.patch
-
-	# fix maildir paths
-	sed -i -e 's|Maildir|.maildir|g' \
-		vchkpw.c vconvert.c vdelivermail.c \
-		vpopbull.c vpopmail.c vqmaillocal.c \
-		vuserinfo.c maildirquota.c || die
-
-	# remove vpopmail advertisement
-	sed -i -e '/printf.*vpopmail/s:vpopmail (:(:' \
-		vdelivermail.c vpopbull.c vqmaillocal.c || die
-
-	eautoreconf
-	ht_fix_file cdb/Makefile
-}
-
-src_configure() {
-	vpopmail_set_homedir
-
-	if use mysql; then
-		authopts=" \
-			--enable-auth-module=mysql \
-			--enable-libdir=/usr/lib/mysql \
-			--enable-sql-logging \
-			--enable-valias \
-			--disable-mysql-replication \
-			--enable-mysql-limits"
-	else
-		authopts="--enable-auth-module=cdb"
-	fi
-
-	econf ${authopts} \
-		--sysconfdir=${VPOP_HOME}/etc \
-		--enable-non-root-build \
-		--enable-qmaildir=${QMAIL_HOME} \
-		--enable-qmail-newu=${QMAIL_HOME}/bin/qmail-newu \
-		--enable-qmail-inject=${QMAIL_HOME}/bin/qmail-inject \
-		--enable-qmail-newmrh=${QMAIL_HOME}/bin/qmail-newmrh \
-		--enable-vpopuser=vpopmail \
-		--enable-vpopgroup=vpopmail \
-		--enable-many-domains \
-		--enable-file-locking \
-		--enable-file-sync \
-		--enable-md5-passwords \
-		--enable-logging \
-		--enable-auth-logging \
-		--enable-log-name=vpopmail \
-		--enable-qmail-ext \
-		--disable-tcpserver-file \
-		--disable-roaming-users \
-		$(use_enable ipalias ip-alias-domains) \
-		$(use_enable clearpasswd clear-passwd) \
-		$(use_enable maildrop) \
-		$(use_enable maildrop maildrop-prog /usr/bin/maildrop)
-}
-
-src_compile() {
-	emake || die "make failed"
-}
-
-src_install() {
-	vpopmail_set_homedir
-
-	# bug #277764
-	emake -j1 DESTDIR="${D}" install || die "make install failed"
-	keepdir "${VPOP_HOME}"/domains
-
-	# install helper script for maildir conversion
-	into "${VPOP_HOME}"
-	dobin "${FILESDIR}"/vpopmail-Maildir-dotmaildir-fix.sh
-	into /usr
-
-	dodoc doc/AUTHORS ChangeLog doc/FAQ doc/INSTALL doc/README*
-	dohtml doc/doc_html/* doc/man_html/*
-	rm -rf "${D}/${VPOP_HOME}"/doc
-	dosym /usr/share/doc/${PF}/ "${VPOP_HOME}"/doc
-
-	# create /etc/vpopmail.conf
-	if use mysql; then
-		dodir /etc
-		mv "${D}${VPOP_HOME}"/etc/vpopmail.mysql "${D}"/etc/vpopmail.conf
-		dosym /etc/vpopmail.conf "${VPOP_HOME}"/etc/vpopmail.mysql
-
-		sed -e '12d' -i "${D}"/etc/vpopmail.conf
-		echo '# Read-only DB' >> "${D}"/etc/vpopmail.conf
-		echo 'localhost|0|vpopmail|secret|vpopmail' >> "${D}"/etc/vpopmail.conf
-		echo '# Write DB' >> "${D}"/etc/vpopmail.conf
-		echo 'localhost|0|vpopmail|secret|vpopmail' >> "${D}"/etc/vpopmail.conf
-
-		# lock down perms
-		fperms 640 /etc/vpopmail.conf
-		fowners root:vpopmail /etc/vpopmail.conf
-	fi
-
-	insinto "${VPOP_HOME}"/etc
-	doins vusagec.conf
-	dosym "${VPOP_HOME}"/etc/vusagec.conf /etc/vusagec.conf
-	sed -i 's/Disable = False;/Disable = True;/g' "${D}${VPOP_HOME}"/etc/vusagec.conf
-
-	einfo "Installing env.d entry"
-	dodir /etc/env.d
-	doenvd "${FILESDIR}"/99vpopmail
-
-	einfo "Locking down vpopmail permissions"
-	fowners root:0 -R "${VPOP_HOME}"/{bin,etc,include}
-	fowners root:vpopmail "${VPOP_HOME}"/bin/vchkpw
-	fperms 4711 "${VPOP_HOME}"/bin/vchkpw
-}
-
-pkg_postinst() {
-	if use mysql ; then
-		elog
-		elog "You have 'mysql' turned on in your USE"
-		elog "Vpopmail needs a VALID MySQL USER. Let's call it 'vpopmail'"
-		elog "You MUST add it and then specify its passwd in the /etc/vpopmail.conf file"
-		elog
-		elog "First log into mysql as your mysql root user and pass. Then:"
-		elog "> create database vpopmail;"
-		elog "> use mysql;"
-		elog "> grant select, insert, update, delete, create, drop on vpopmail.* to"
-		elog "  vpopmail@localhost identified by 'your password';"
-		elog "> flush privileges;"
-		elog
-		elog "If you have problems with vpopmail not accepting mail properly,"
-		elog "please ensure that /etc/vpopmail.conf is chmod 640 and"
-		elog "owned by root:vpopmail"
-		elog
-	fi
-
-	# do this for good measure
-	if [[ -e /etc/vpopmail.conf ]]; then
-		chmod 640 /etc/vpopmail.conf
-		chown root:vpopmail /etc/vpopmail.conf
-	fi
-
-	upgradewarning
-}
-
-pkg_postrm() {
-	vpopmail_set_homedir
-
-	elog "The vpopmail DATA will NOT be removed automatically."
-	elog "You can delete them manually by removing the ${VPOP_HOME} directory."
-}
-
-upgradewarning() {
-	ewarn
-	ewarn "Massive important warning if you are upgrading to 5.2.1-r8 or older"
-	ewarn "The internal structure of the mail storage has changed for"
-	ewarn "consistancy with the rest of Gentoo! Please review and utilize the "
-	ewarn "script at ${VPOP_HOME}/bin/vpopmail-Maildir-dotmaildir-fix.sh"
-	ewarn "to upgrade your system! (It can do conversions both ways)."
-	ewarn "You should be able to run it right away without any changes."
-	ewarn
-
-	elog
-	elog "Use of vpopmail's tcp.smtp[.cdb] is also deprecated now, consider"
-	elog "using net-mail/relay-ctrl instead."
-	elog
-
-	if use mysql; then
-		elog
-		elog "If you are upgrading from 5.4.17 or older, you have to fix your"
-		elog "MySQL tables:"
-		elog
-		elog 'ALTER TABLE `dir_control` CHANGE `domain` `domain` CHAR(96) NOT NULL;'
-		elog 'ALTER TABLE `ip_alias_map` CHANGE domain domain CHAR(96) NOT NULL;'
-		elog 'ALTER TABLE `lastauth` CHANGE domain domain CHAR(96) NOT NULL;'
-		elog 'ALTER TABLE `valias` CHANGE domain domain CHAR(96) NOT NULL;'
-		elog 'ALTER TABLE `vlog` CHANGE domain domain CHAR(96) NOT NULL;'
-		elog 'ALTER TABLE `vpopmail` CHANGE domain domain CHAR(96) NOT NULL;'
-		elog 'ALTER TABLE `limits` CHANGE domain domain CHAR(96) NOT NULL,'
-		elog '    ADD `disable_spamassassin` TINYINT(1) DEFAULT '0' NOT NULL AFTER `disable_smtp`,'
-		elog '    ADD `delete_spam` TINYINT(1) DEFAULT '0' NOT NULL AFTER `disable_spamassassin`;'
-		elog
-	fi
-
-	ewarn
-	ewarn "Newer versions of vpopmail contain a quota daemon called vusaged."
-	ewarn "This ebuild DOES NOT INSTALL vusaged and has therefore disabled"
-	ewarn "its usage in ${VPOP_HOME}/etc/vusagec.conf. DO NOT ENABLE!"
-	ewarn "Otherwise mail delivery WILL BREAK"
-	ewarn
-}
diff --git a/net-mail/vpopmail/vpopmail-5.4.30-r2.ebuild b/net-mail/vpopmail/vpopmail-5.4.30-r2.ebuild
deleted file mode 100644
index 59ddd969b329..000000000000
--- a/net-mail/vpopmail/vpopmail-5.4.30-r2.ebuild
+++ /dev/null
@@ -1,233 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="2"
-
-inherit autotools eutils fixheadtails qmail user
-
-HOMEPAGE="http://www.inter7.com/index.php?page=vpopmail"
-DESCRIPTION="A collection of programs to manage virtual email domains and accounts on your Qmail mail servers"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="clearpasswd ipalias maildrop mysql spamassassin"
-
-DEPEND="virtual/qmail
-	maildrop? ( mail-filter/maildrop )
-	mysql? ( virtual/mysql )
-	spamassassin? ( mail-filter/spamassassin )"
-RDEPEND="${DEPEND}"
-
-# This makes sure the variable is set, and that it isn't null.
-VPOP_DEFAULT_HOME="/var/vpopmail"
-
-vpopmail_set_homedir() {
-	VPOP_HOME=$(egethome vpopmail)
-	if [[ -z "${VPOP_HOME}" ]]; then
-		ebeep
-		eerror "vpopmail's home directory is null in passwd data!"
-		eerror "You probably want to check that out."
-		eerror "Continuing with default."
-		VPOP_HOME="${VPOP_DEFAULT_HOME}"
-	else
-		einfo "Setting VPOP_HOME to: $VPOP_HOME"
-	fi
-}
-
-pkg_setup() {
-	enewgroup vpopmail 89
-	enewuser vpopmail 89 -1 ${VPOP_DEFAULT_HOME} vpopmail
-	upgradewarning
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-5.4.9-access.violation.patch
-	epatch "${FILESDIR}"/${PN}-lazy.patch
-	epatch "${FILESDIR}"/${PN}-double-free.patch
-
-	# fix maildir paths
-	sed -i -e 's|Maildir|.maildir|g' \
-		vchkpw.c vconvert.c vdelivermail.c \
-		vpopbull.c vpopmail.c vqmaillocal.c \
-		vuserinfo.c maildirquota.c || die
-
-	# remove vpopmail advertisement
-	sed -i -e '/printf.*vpopmail/s:vpopmail (:(:' \
-		vdelivermail.c vpopbull.c vqmaillocal.c || die
-
-	eautoreconf
-	ht_fix_file cdb/Makefile
-}
-
-src_configure() {
-	vpopmail_set_homedir
-
-	if use mysql; then
-		authopts=" \
-			--enable-auth-module=mysql \
-			--enable-libdir=/usr/lib/mysql \
-			--enable-sql-logging \
-			--enable-valias \
-			--disable-mysql-replication \
-			--enable-mysql-limits"
-	else
-		authopts="--enable-auth-module=cdb"
-	fi
-
-	econf ${authopts} \
-		--sysconfdir=${VPOP_HOME}/etc \
-		--enable-non-root-build \
-		--enable-qmaildir=${QMAIL_HOME} \
-		--enable-qmail-newu=${QMAIL_HOME}/bin/qmail-newu \
-		--enable-qmail-inject=${QMAIL_HOME}/bin/qmail-inject \
-		--enable-qmail-newmrh=${QMAIL_HOME}/bin/qmail-newmrh \
-		--enable-vpopuser=vpopmail \
-		--enable-vpopgroup=vpopmail \
-		--enable-many-domains \
-		--enable-file-locking \
-		--enable-file-sync \
-		--enable-md5-passwords \
-		--enable-logging \
-		--enable-auth-logging \
-		--enable-log-name=vpopmail \
-		--enable-qmail-ext \
-		--disable-tcpserver-file \
-		--disable-roaming-users \
-		$(use_enable ipalias ip-alias-domains) \
-		$(use_enable clearpasswd clear-passwd) \
-		$(use_enable maildrop) \
-		$(use_enable maildrop maildrop-prog /usr/bin/maildrop) \
-		$(use_enable spamassassin)
-}
-
-src_compile() {
-	emake || die "make failed"
-}
-
-src_install() {
-	vpopmail_set_homedir
-
-	# bug #277764
-	emake -j1 DESTDIR="${D}" install || die "make install failed"
-	keepdir "${VPOP_HOME}"/domains
-
-	# install helper script for maildir conversion
-	into "${VPOP_HOME}"
-	dobin "${FILESDIR}"/vpopmail-Maildir-dotmaildir-fix.sh
-	into /usr
-
-	dodoc doc/AUTHORS ChangeLog doc/FAQ doc/INSTALL doc/README*
-	dohtml doc/doc_html/* doc/man_html/*
-	rm -rf "${D}/${VPOP_HOME}"/doc
-	dosym /usr/share/doc/${PF}/ "${VPOP_HOME}"/doc
-
-	# create /etc/vpopmail.conf
-	if use mysql; then
-		dodir /etc
-		mv "${D}${VPOP_HOME}"/etc/vpopmail.mysql "${D}"/etc/vpopmail.conf
-		dosym /etc/vpopmail.conf "${VPOP_HOME}"/etc/vpopmail.mysql
-
-		sed -e '12d' -i "${D}"/etc/vpopmail.conf
-		echo '# Read-only DB' >> "${D}"/etc/vpopmail.conf
-		echo 'localhost|0|vpopmail|secret|vpopmail' >> "${D}"/etc/vpopmail.conf
-		echo '# Write DB' >> "${D}"/etc/vpopmail.conf
-		echo 'localhost|0|vpopmail|secret|vpopmail' >> "${D}"/etc/vpopmail.conf
-
-		# lock down perms
-		fperms 640 /etc/vpopmail.conf
-		fowners root:vpopmail /etc/vpopmail.conf
-	fi
-
-	insinto "${VPOP_HOME}"/etc
-	doins vusagec.conf
-	dosym "${VPOP_HOME}"/etc/vusagec.conf /etc/vusagec.conf
-	sed -i 's/Disable = False;/Disable = True;/g' "${D}${VPOP_HOME}"/etc/vusagec.conf
-
-	einfo "Installing env.d entry"
-	dodir /etc/env.d
-	doenvd "${FILESDIR}"/99vpopmail
-
-	einfo "Locking down vpopmail permissions"
-	fowners root:0 -R "${VPOP_HOME}"/{bin,etc,include}
-	fowners root:vpopmail "${VPOP_HOME}"/bin/vchkpw
-	fperms 4711 "${VPOP_HOME}"/bin/vchkpw
-}
-
-pkg_postinst() {
-	if use mysql ; then
-		elog
-		elog "You have 'mysql' turned on in your USE"
-		elog "Vpopmail needs a VALID MySQL USER. Let's call it 'vpopmail'"
-		elog "You MUST add it and then specify its passwd in the /etc/vpopmail.conf file"
-		elog
-		elog "First log into mysql as your mysql root user and pass. Then:"
-		elog "> create database vpopmail;"
-		elog "> use mysql;"
-		elog "> grant select, insert, update, delete, create, drop on vpopmail.* to"
-		elog "  vpopmail@localhost identified by 'your password';"
-		elog "> flush privileges;"
-		elog
-		elog "If you have problems with vpopmail not accepting mail properly,"
-		elog "please ensure that /etc/vpopmail.conf is chmod 640 and"
-		elog "owned by root:vpopmail"
-		elog
-	fi
-
-	# do this for good measure
-	if [[ -e /etc/vpopmail.conf ]]; then
-		chmod 640 /etc/vpopmail.conf
-		chown root:vpopmail /etc/vpopmail.conf
-	fi
-
-	upgradewarning
-}
-
-pkg_postrm() {
-	vpopmail_set_homedir
-
-	elog "The vpopmail DATA will NOT be removed automatically."
-	elog "You can delete them manually by removing the ${VPOP_HOME} directory."
-}
-
-upgradewarning() {
-	ewarn
-	ewarn "Massive important warning if you are upgrading to 5.2.1-r8 or older"
-	ewarn "The internal structure of the mail storage has changed for"
-	ewarn "consistancy with the rest of Gentoo! Please review and utilize the "
-	ewarn "script at ${VPOP_HOME}/bin/vpopmail-Maildir-dotmaildir-fix.sh"
-	ewarn "to upgrade your system! (It can do conversions both ways)."
-	ewarn "You should be able to run it right away without any changes."
-	ewarn
-
-	elog
-	elog "Use of vpopmail's tcp.smtp[.cdb] is also deprecated now, consider"
-	elog "using net-mail/relay-ctrl instead."
-	elog
-
-	if use mysql; then
-		elog
-		elog "If you are upgrading from 5.4.17 or older, you have to fix your"
-		elog "MySQL tables:"
-		elog
-		elog 'ALTER TABLE `dir_control` CHANGE `domain` `domain` CHAR(96) NOT NULL;'
-		elog 'ALTER TABLE `ip_alias_map` CHANGE domain domain CHAR(96) NOT NULL;'
-		elog 'ALTER TABLE `lastauth` CHANGE domain domain CHAR(96) NOT NULL;'
-		elog 'ALTER TABLE `valias` CHANGE domain domain CHAR(96) NOT NULL;'
-		elog 'ALTER TABLE `vlog` CHANGE domain domain CHAR(96) NOT NULL;'
-		elog 'ALTER TABLE `vpopmail` CHANGE domain domain CHAR(96) NOT NULL;'
-		elog 'ALTER TABLE `limits` CHANGE domain domain CHAR(96) NOT NULL,'
-		elog '    ADD `disable_spamassassin` TINYINT(1) DEFAULT '0' NOT NULL AFTER `disable_smtp`,'
-		elog '    ADD `delete_spam` TINYINT(1) DEFAULT '0' NOT NULL AFTER `disable_spamassassin`;'
-		elog
-	fi
-
-	ewarn
-	ewarn "Newer versions of vpopmail contain a quota daemon called vusaged."
-	ewarn "This ebuild DOES NOT INSTALL vusaged and has therefore disabled"
-	ewarn "its usage in ${VPOP_HOME}/etc/vusagec.conf. DO NOT ENABLE!"
-	ewarn "Otherwise mail delivery WILL BREAK"
-	ewarn
-}
diff --git a/net-mail/vqadmin/Manifest b/net-mail/vqadmin/Manifest
index c4ba73ff4fe5..fb84498f1cd7 100644
--- a/net-mail/vqadmin/Manifest
+++ b/net-mail/vqadmin/Manifest
@@ -1,2 +1 @@
-DIST vqadmin-2.3.6.tar.gz 155771 SHA256 e72fde3cf538d1e93a6aaaffbce100aeb417350d07cb73ee49b08c22256076d9 SHA512 80617f21ab81ef95b8272f116d2c0af86303a5f2c34791aa655cfc180ad3aada3864d9cc9d86f7719d5dec7cd47ef97003d73bf6632358010d14d6c43b7ae9fc WHIRLPOOL 476425f29ab382034f387d69cfbf7988fa6d41bdea6f405f39c69aa0390286c52ebcfa94335dcff27343347f4c9663bddf19dce7be990556c9530baeedaa80af
 DIST vqadmin-2.3.7.tar.gz 153678 SHA256 af68640f454896d6d267b6aee63a79ae0605c0104cff083aa6dc5df0d8c4ee0f SHA512 c427dc4b1e30926b0d3774bd0d296bf78a98037c566a82fa790f7a25d1fac64a80172498fd6342e93514108e42fdec0ebf1a76029546e43100ebcae5b845ef88 WHIRLPOOL d684a4f88797d2d9ef0c39e0d913e7ce301e5c1853b6946bf08a180b067e647982963c2aff33c902634578630a76d962e9613d79e5d6c376b7a1ade138c43367
diff --git a/net-mail/vqadmin/vqadmin-2.3.6.ebuild b/net-mail/vqadmin/vqadmin-2.3.6.ebuild
deleted file mode 100644
index 10ee9006c4ba..000000000000
--- a/net-mail/vqadmin/vqadmin-2.3.6.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit depend.apache
-
-DESCRIPTION="A web based control pannel to manage Virtual Qmail Domains. Works with qmailadmin"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-HOMEPAGE="http://www.inter7.com/${PN}"
-KEYWORDS="~x86 ~ppc ~sparc"
-IUSE=""
-LICENSE="GPL-2"
-SLOT="0"
-DEPEND=">=net-mail/vpopmail-5.3
-		virtual/qmail"
-RDEPEND="${DEPEND}
-	net-mail/qmailadmin"
-
-need_apache
-
-src_compile() {
-	local dir_vhost="/var/www/localhost/"
-	local dir_vpopmail="/var/vpopmail"
-	local dir_htdocs="${dir_vhost}/htdocs/${PN}"
-	local dir_htdocs_images="${dir_htdocs}/images"
-	local url_htdocs_images="/${PN}/images"
-	local dir_cgibin="${dir_vhost}/cgi-bin"
-	local url_cgibin="/cgi-bin/${PN}"
-	local dir_htdocs_htmlib="/usr/share/${PN}/htmllib"
-	local dir_qmail="/var/qmail"
-	local bin_true="/bin/true"
-	local dir_ezmlm="/usr/bin"
-	local dir_autorespond="/var/qmail/bin"
-	sed -e "3356iwwwroot='${dir_htdocs}'" -e '3356,3369d' -i configure || die "failed to fix configure"
-
-	find . -name 'Makefile*' -o -name '*.c' -o -name '*.html' | xargs -n1 -t sed 's|images/vqadmin|vqadmin/images|g' -i
-
-	econf ${myopts} \
-	--enable-vpopmaildir=${dir_vpopmail} \
-	--enable-htmldir=${dir_htdocs} \
-	--enable-imageurl=${url_htdocs_images} \
-	--enable-imagedir=${dir_htdocs_images} \
-	--enable-htmllibdir=${dir_htdocs_htmlib} \
-	--enable-qmaildir=${dir_qmail} \
-	--enable-true-path=${bin_true} \
-	--enable-ezmlmdir=${dir_ezmlm} \
-	--enable-cgibindir=${dir_cgibin} \
-	--enable-cgipath=${url_cgibin} \
-	--enable-vpopuser=vpopmail \
-	--enable-vpopgroup=vpopmail \
-	|| die "econf failed"
-
-	sed 's|/vqadmin/vqadmin/|/vqadmin/|g' -i Makefile
-
-	emake || die
-	sed -e "/install-exec-local:/,/chmod go+r/s|${dir_vhost}|\$(DESTDIR)${dir_vhost}|" -i Makefile
-}
-
-src_install () {
-	make DESTDIR=${D} install || die
-
-	# Install documentation.
-	dodoc ACL AUTHORS BUGS ChangeLog FAQ INSTALL NEWS TODO README
-}
-
-#pkg_config() {
-#
-#	einfo "Performing post-installation routines for ${P}."
-#
-#	cat > ${REAL_CGIBINDIR}/vqadmin/vqadmin.conf <<EOF
-#<Directory "${REAL_CGIBINDIR}/vqadmin">
-#	deny from all
-#	Options ExecCGI
-#	AllowOverride AuthConfig
-#	Order deny,allow
-#</Directory>
-#EOF
-#
-#	# Including configuration to the apache config file
-#	echo "Include ${REAL_CGIBINDIR}/vqadmin/vqadmin.conf" >> /etc/apache/conf/apache.conf
-#
-#	# Creating .htaccess
-#	einfo ""
-#	einfo "We need to create an htaccess for the directory so Apache knows"
-#	einfo "how to authenticate users trying to access the directory."
-#	cat > ${REAL_CGIBINDIR}/vqadmin/.htaccess <<EOF
-#AuthType Basic
-#AuthUserFile /etc/apache/conf/vqadmin.passwd
-#AuthName vqadmin
-#require valid-user
-#satisfy any
-#EOF
-#	# Tightening Permissions
-#	chown apache.apache ${REAL_CGIBINDIR}/vqadmin/.htaccess
-#	chmod 600 ${REAL_CGIBINDIR}/vqadmin/.htaccess
-#
-#	# How set up users ?
-#	einfo "Now, You can create a user. Example: "
-#	einfo "	  htpasswd -c /etc/apache/conf/vqadmin.passwd username"
-#	einfo "then: "
-#	einfo "	  cd /etc/apache/conf/ && chown root.apache vqadmin.passwd"
-#	einfo "	  chmod 640 vqadmin.passwd"
-#	einfo ""
-#	einfo "IMPORTANT ! Use the -c (-create) switch ONLY the first time"
-#	einfo "IMPORTANT ! You will have to restart apache to get vqadmin working"
-#}
-
-#pkg_postrm() {
-#	rm -rf ${REAL_CGIBINDIR}/vqadmin/vqadmin.conf
-#	rm -rf ${REAL_CGIBINDIR}/vqadmin/.htaccess
-#	rmdir ${REAL_CGIBINDIR}/vqadmin
-#	sed "/^Include.*vqadmin.conf$/d" /etc/apache/conf/apache.conf > /etc/apache/conf/apache.conf.new
-#	mv --force /etc/apache/conf/apache.conf.new /etc/apache/conf/apache.conf
-#}
diff --git a/net-mail/yosucker/Manifest b/net-mail/yosucker/Manifest
index f0fb5f8c26e8..5368e42f10eb 100644
--- a/net-mail/yosucker/Manifest
+++ b/net-mail/yosucker/Manifest
@@ -1,3 +1,2 @@
 DIST YoSucker-pr73.tar.gz 43581 SHA256 73f4e0f3412b4172f1b27ebf3c68eee38efd8bb67b68987738e05c7a7b132126 SHA512 a6010b0cf04c12a6ba8aed294c5613f5c17bc7dd25b3beb90f748f40418c3cd3f52089888e879ac81e271a135efff661ec9b3e03dd9aa8c8b8b500816f235f3b WHIRLPOOL 51494fcd1178b960dfcc871271d10fa93a8f4318fcc43588016cc90283c1d808650c14eca934fe3a83903eeddbbfbb81de9565255804ff46f643f7d0a53e923f
-DIST YoSucker-pr75.tar.gz 43773 SHA256 2d24f35380b8fd83407e29e8dcfa1350f68dce963f5fa1cfebb72b073022c2b4 SHA512 b758a253a565db34f5199089096ed224387e0b5f115e094b686d9a0c1427e91e90bbfbecb17b696c26057dfc6c9385c5c0111a462d6fd99b6b5bd2d8bbafb5ca WHIRLPOOL 13f8b0e9b4b2d9596fec803d76e3c8d6550989c063e66d8cc216f10b5754aebd606bc9f53681e85bbeeba54015456561420baec48a0f57e587b9c84c278724f3
 DIST YoSucker-pr77.tar.gz 44703 SHA256 a61b3382d9059b7f5df40223b0ccdcb49a10ca6098c9ececc935a89e5593feda SHA512 ac69ef919d602681b1812727ac1de2f2a6f158b1204bae803ce936d5db0ae16816ac778146ffd9fc886a31c1736779bfbc7c9c548e94722fd07f8e8b63139265 WHIRLPOOL d4b18796b45201b9baeb89b17198608f60536d7da8ac2007231aaaf72264eccd9260d2957a40ad7896e04db06eae07116958e9158bbc3d4978e2eb5262bfb1e1
diff --git a/net-mail/yosucker/yosucker-75.ebuild b/net-mail/yosucker/yosucker-75.ebuild
deleted file mode 100644
index cdd635751835..000000000000
--- a/net-mail/yosucker/yosucker-75.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit eutils
-
-MY_P="YoSucker-pr${PV}"
-S=${WORKDIR}/${MY_P}
-IUSE=""
-DESCRIPTION="Downloads mail from a Yahoo! webmail account to a local mail spool, an mbox file, or to procmail"
-SRC_URI="mirror://sourceforge/yosucker/${MY_P}.tar.gz"
-HOMEPAGE="http://yosucker.sourceforge.net"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-SLOT="0"
-
-DEPEND="dev-lang/perl
-		dev-perl/TermReadKey
-		virtual/perl-Digest-MD5
-		dev-perl/IO-Socket-SSL
-		virtual/perl-MIME-Base64"
-
-RDEPEND=""
-
-src_install() {
-	dobin bin/*
-	mv utils/README utils/README.utils
-	dodoc docs/*
-	insinto /usr/share/doc/${P}/conf
-	doins conf/*
-	dolib lib/sputnik.pm
-
-}
-
-pkg_postinst() {
-	echo
-	draw_line
-	ewarn "The Yahoo! Mail interface has changed!!"
-	ewarn "If you have been using previous versions of YoSucker, you may need to"
-	ewarn "log in to Yahoo! Mail  manually before it works again."
-	draw_line
-	echo
-}
diff --git a/profiles/package.mask b/profiles/package.mask
index 44d660907aff..086d68753e28 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -30,6 +30,11 @@
 
 #--- END OF EXAMPLES ---
 
+# Andreas K. Hüttel <dilfridge@gentoo.org> (16 Apr 2016)
+# Masked because of security bug 580210
+=www-misc/monitorix-3.6.0
+=www-misc/monitorix-3.8.1
+
 # Mike Gilbert <floppym@gentoo.org> (16 Apr 2016)
 # Causes numerous build failures. Bug 575232.
 =sys-libs/glibc-2.23-r1
diff --git a/sci-calculators/pcalc/Manifest b/sci-calculators/pcalc/Manifest
index 4d9c3044a021..d13a74f53e13 100644
--- a/sci-calculators/pcalc/Manifest
+++ b/sci-calculators/pcalc/Manifest
@@ -1,4 +1,2 @@
-DIST pcalc-1.2.tar.bz2 95921 SHA256 ae7548463492c931c24b89143a2c3301f0c0a035a97907bf6d30fa5feffbc5f0 SHA512 36d219e41f8e94bd857b4be37c2b12ee57fbe66b794767fff6be9a1bbc9a9650e1ab3170e7449fa43f0ddd734767b28d992b5655c53b8321abdfd628f5aa9e02 WHIRLPOOL 79c2168f5217f5206d364286932a5f81f082e9a63139cd05981ce4bf2533650601c170f6024f2f80c8b746b246db24c35b4e5b12fe6f0008bafc63fa0613f9ad
-DIST pcalc-1.3.tar.lzma 88669 SHA256 3016d257062094292269b9637b21ae5cd34dd8efd2844ba802d12f1a4dd91810 SHA512 062ad521d9a43b113add11eb04b07b68a241f14c1a41b1289466a098630e4bae53a60b4cde1fce6c34e7238dd31a1b7247242cc6a453874f9ef6c15da090b8d5 WHIRLPOOL 112c9ce5ecaf0acbd7e236301ecf1f19aba343da72cc5f1e5a35a900247fb516dcb15b8680910603cb5643d7370031215bf1224fa7170e46474f5357a9641449
 DIST pcalc-2.tar.lzma 92758 SHA256 be93062e8a15029ea50e4f9f9d0fd4fdbab82c927b7b93afa6f7fa398081c78f SHA512 f36db3d960a2feeaad5717349a6fff461f01ca074d016a3faab1141729e9f25d17e650f0e108c950f5ae7115ac4a778427687639fde52b2d28419cb9b9526adb WHIRLPOOL 7b8256d9a478f56ae5f3ef2f92276ee3487ad3146922e80ab836ad9731da92770c7c47ba97a604f4a05fb39dd4779f33879d4873df95d86abbc9e69447430739
 DIST pcalc-3.tar.xz 66908 SHA256 13db2b0594e61deedb07640b21b20b5242aae955d6febf1806e1f295408f694c SHA512 55b6644300a8eb5224df5a0885907c10847df7ab6296d012eb2bb638876687ddbe23d5b76e31ac6ff4c159e44940d5cf6ba747f2a410943fdc25c9d9855fd60e WHIRLPOOL ea2d44694cb30284d782e84a43422c597ef75ef7442718ff5288db74a3a3413bd79b5e237e443bbc3be4a030262911b283180daae5f00dcee772fc65ecce8345
diff --git a/sci-calculators/pcalc/pcalc-1.2.ebuild b/sci-calculators/pcalc/pcalc-1.2.ebuild
deleted file mode 100644
index d8d9dcd55397..000000000000
--- a/sci-calculators/pcalc/pcalc-1.2.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit eutils
-
-DESCRIPTION="the programmers calculator"
-HOMEPAGE="https://github.com/vapier/pcalc"
-SRC_URI="mirror://sourceforge/pcalc/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
-IUSE=""
-
-src_install() {
-	emake install DESTDIR="${D}" || die
-	dodoc AUTHORS ChangeLog EXAMPLE README
-}
diff --git a/sci-calculators/pcalc/pcalc-1.3.ebuild b/sci-calculators/pcalc/pcalc-1.3.ebuild
deleted file mode 100644
index e4715a7dc768..000000000000
--- a/sci-calculators/pcalc/pcalc-1.3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit toolchain-funcs
-
-DESCRIPTION="the programmers calculator"
-HOMEPAGE="https://github.com/vapier/pcalc"
-SRC_URI="mirror://sourceforge/pcalc/${P}.tar.lzma"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
-IUSE=""
-
-DEPEND="sys-devel/flex"
-RDEPEND=""
-
-src_compile() {
-	tc-export CC
-	emake pcalc || die
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die
-	dodoc AUTHORS ChangeLog EXAMPLE README
-}
diff --git a/sys-apps/systemd/files/229-sysmacros.patch b/sys-apps/systemd/files/229-sysmacros.patch
new file mode 100644
index 000000000000..7b0dfbf46d68
--- /dev/null
+++ b/sys-apps/systemd/files/229-sysmacros.patch
@@ -0,0 +1,79 @@
+From 27d13af71c3af6b2f9b60556d2c046dbb6e36e23 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Mon, 14 Mar 2016 17:44:49 -0400
+Subject: [PATCH] include sys/sysmacros.h in more places
+
+Since glibc is moving away from implicitly including sys/sysmacros.h
+all the time via sys/types.h, include the header directly in more
+places.  This seems to cover most makedev/major/minor usage.
+---
+ src/basic/macro.h       | 1 +
+ src/basic/util.h        | 1 +
+ src/libudev/libudev.h   | 1 +
+ src/systemd/sd-device.h | 1 +
+ src/udev/udev.h         | 1 +
+ 5 files changed, 5 insertions(+)
+
+diff --git a/src/basic/macro.h b/src/basic/macro.h
+index c34441d..b36a956 100644
+--- a/src/basic/macro.h
++++ b/src/basic/macro.h
+@@ -23,6 +23,7 @@
+ #include <inttypes.h>
+ #include <stdbool.h>
+ #include <sys/param.h>
++#include <sys/sysmacros.h>
+ #include <sys/types.h>
+ 
+ #define _printf_(a,b) __attribute__ ((format (printf, a, b)))
+diff --git a/src/basic/util.h b/src/basic/util.h
+index e095254..286db05 100644
+--- a/src/basic/util.h
++++ b/src/basic/util.h
+@@ -36,6 +36,7 @@
+ #include <sys/socket.h>
+ #include <sys/stat.h>
+ #include <sys/statfs.h>
++#include <sys/sysmacros.h>
+ #include <sys/types.h>
+ #include <time.h>
+ #include <unistd.h>
+diff --git a/src/libudev/libudev.h b/src/libudev/libudev.h
+index eb58740..3f6d0ed 100644
+--- a/src/libudev/libudev.h
++++ b/src/libudev/libudev.h
+@@ -21,6 +21,7 @@
+ #define _LIBUDEV_H_
+ 
+ #include <stdarg.h>
++#include <sys/sysmacros.h>
+ #include <sys/types.h>
+ 
+ #ifdef __cplusplus
+diff --git a/src/systemd/sd-device.h b/src/systemd/sd-device.h
+index 5bfca6e..c1d0756 100644
+--- a/src/systemd/sd-device.h
++++ b/src/systemd/sd-device.h
+@@ -22,6 +22,7 @@
+ ***/
+ 
+ #include <inttypes.h>
++#include <sys/sysmacros.h>
+ #include <sys/types.h>
+ 
+ #include "_sd-common.h"
+diff --git a/src/udev/udev.h b/src/udev/udev.h
+index 5659051..8433e8d 100644
+--- a/src/udev/udev.h
++++ b/src/udev/udev.h
+@@ -19,6 +19,7 @@
+  */
+ 
+ #include <sys/param.h>
++#include <sys/sysmacros.h>
+ #include <sys/types.h>
+ 
+ #include "libudev.h"
+-- 
+2.8.1
+
diff --git a/sys-apps/systemd/systemd-229-r100.ebuild b/sys-apps/systemd/systemd-229-r100.ebuild
index cd9d4466dd89..66357cf7af4c 100644
--- a/sys-apps/systemd/systemd-229-r100.ebuild
+++ b/sys-apps/systemd/systemd-229-r100.ebuild
@@ -153,6 +153,7 @@ src_prepare() {
 		"${FILESDIR}/218-Dont-enable-audit-by-default.patch"
 		"${FILESDIR}/228-noclean-tmp.patch"
 		"${FILESDIR}/linux-headers-if.h.patch"
+		"${FILESDIR}/229-sysmacros.patch"
 	)
 	[[ -d "${WORKDIR}"/patches ]] && PATCHES+=( "${WORKDIR}"/patches )
 
diff --git a/sys-apps/systemd/systemd-229.ebuild b/sys-apps/systemd/systemd-229.ebuild
index 0a35d504a89f..0c297d222f00 100644
--- a/sys-apps/systemd/systemd-229.ebuild
+++ b/sys-apps/systemd/systemd-229.ebuild
@@ -153,6 +153,7 @@ src_prepare() {
 		"${FILESDIR}/218-Dont-enable-audit-by-default.patch"
 		"${FILESDIR}/228-noclean-tmp.patch"
 		"${FILESDIR}/linux-headers-if.h.patch"
+		"${FILESDIR}/229-sysmacros.patch"
 	)
 	[[ -d "${WORKDIR}"/patches ]] && PATCHES+=( "${WORKDIR}"/patches )
 
diff --git a/sys-block/mtx/Manifest b/sys-block/mtx/Manifest
index 5581d7ad5f28..90bda46bbc40 100644
--- a/sys-block/mtx/Manifest
+++ b/sys-block/mtx/Manifest
@@ -1,2 +1 @@
-DIST mtx-1.2.18rel.tar.gz 167728 SHA256 d333f7bcc37029268fbb57e64ba375e849d348b65391447c62e7e153ba55eed2 SHA512 c0b84d4a2600f931c6726004e9607ef0e580ceeb11d23f0e31301e8ee98e87c39c6ee822ca283915bb10175ba5ad45cd7bb450960ffc25785c95205a03ce4076 WHIRLPOOL 5cb38ce40f0d2bcbfba82ecc0031a83bd27f4594db6dd74a1cb7f7292e7308e88afaad90c29d5aff0488a1453c4157acac23f7e0d38235984f33b54e4c3cdda2
 DIST mtx-1.3.12.tar.gz 235214 SHA256 0261c5e90b98b6138cd23dadecbc7bc6e2830235145ed2740290e1f35672d843 SHA512 d54c360608a2c25bd4d31af3e659de0557ed355fbe45d2dbf1341cfc7e468515eb07eb89200b77ee1fe2618139295ba3c3f4340cc43a7c506ced26aab2652028 WHIRLPOOL 2671cfbf02c6af7f51d7c91e763c174cc297a7a8b66af31e493d8020ecda455f3b40e69dfbb45c102738fbfaa32f1bd054568c58cbffe53e69ab1f35e772c3c5
diff --git a/sys-block/mtx/mtx-1.2.18.ebuild b/sys-block/mtx/mtx-1.2.18.ebuild
deleted file mode 100644
index 7a6862ed1095..000000000000
--- a/sys-block/mtx/mtx-1.2.18.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-IUSE=""
-
-DESCRIPTION="Utilities for controlling SCSI media changers and tape drives"
-HOMEPAGE="http://mtx.sourceforge.net"
-LICENSE="GPL-2"
-DEPEND=""
-SRC_URI="ftp://ftp.badtux.net/pub/storage/${PN}/${P}rel.tar.gz"
-KEYWORDS="x86 amd64 sparc alpha ppc hppa ppc64"
-SLOT="0"
-
-src_unpack() {
-	unpack ${A}
-	mv ${P}rel ${S}
-	sed -e 's:/usr/src/linux/include ::' -i ${S}/Makefile.in
-}
-
-src_compile() {
-	econf || die "Configure failed"
-	emake || die "Make failed"
-}
-
-src_install () {
-	dodoc CHANGES COMPATIBILITY FAQ README LICENSE TODO
-	dohtml mtxl.README.html
-	einstall || die "Install failed"
-}
diff --git a/sys-block/qla-fc-firmware/Manifest b/sys-block/qla-fc-firmware/Manifest
index fd9732099c39..8136783cfd5c 100644
--- a/sys-block/qla-fc-firmware/Manifest
+++ b/sys-block/qla-fc-firmware/Manifest
@@ -1,3 +1 @@
-DIST qla-fc-firmware-20071207.tar.bz2 910151 SHA256 fc062041b8f82a72a8229075284280bbafd3d297d4b71dd05f787bcaeb8de58b SHA512 631fb5517426593d683a80ffb1b38fd698a1d4ac84ff60d6dac0dec37f9579b1e16dd5a25ce27ed0d33ba8a74de1dfa024edab699691e171d0dd50a64ca053e4 WHIRLPOOL debbb0ad8b6b0550436cb4ac9fded96110964767a07107ecb4a8a70cef1cee3c1b93c50dea86379ff099ad98f74966cb7b8824425e761a4f57f02367650491f4
-DIST qla-fc-firmware-20080423.tar.bz2 1010881 SHA256 6ecc88f97860717d42793e5ba7f672aa547b83151f176aefce9bbc8decee5497 SHA512 0f7fc3bf55a7e6a2d193c4e3bba362f7958177b2f28ed87df277174058223881a013d8f67b429e8eeca27b3d2b5ea25005b4a84abd6f6c0618a38bb84fb0d617 WHIRLPOOL f155ea390fdee4d73248d7ad17001c52503233f7c871c5c4a2268dd7f964d562acbbaebdfd91eead709556c0c7497dbbeac4da8d5d6ca02493cf9b5310dbaa8a
 DIST qla-fc-firmware-20101015.tar.bz2 3237889 SHA256 e2951f8a130350ca38990afb60d16c4ea3262de5f9a7d9a75c88db04095bb6cb SHA512 19cd38a2a146cc3147840a2c87c0f44996896ff1b1961d1d858d054db890d6808c89bfe93e82a54536933180da3b8cc8e54a5f57d9c9edcb3129a11dbd394342 WHIRLPOOL 02e523b03e193b8473f89eab3de1914a92e67a4ddea324629b0ccf14fd0227b66d17587567f821262a2d535ca49e612b503eebdc198429eaa39b201669c6eb56
diff --git a/sys-block/qla-fc-firmware/qla-fc-firmware-20071207-r1.ebuild b/sys-block/qla-fc-firmware/qla-fc-firmware-20071207-r1.ebuild
deleted file mode 100644
index cb62d6c97d6c..000000000000
--- a/sys-block/qla-fc-firmware/qla-fc-firmware-20071207-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-DESCRIPTION="QLogic Linux Fibre Channel HBA Firmware for ql2xxx cards"
-HOMEPAGE="ftp://ftp.qlogic.com/outgoing/linux/firmware/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-LICENSE="qlogic-fibre-channel-firmware"
-SLOT="0"
-KEYWORDS="amd64 ppc sparc x86"
-IUSE=""
-
-# really depends on absolutely nothing
-DEPEND=""
-RDEPEND="!sys-kernel/linux-firmware"
-
-FW_BASENAME="ql2100_fw.bin ql2200_fw.bin ql2300_fw.bin ql2322_fw.bin ql2400_fw.bin ql2500_fw.bin ql6312_fw.bin"
-
-src_install() {
-	# We must install this, say QLogic's people.
-	# They have claimed to me that the /license/ directory isn't sufficient, as
-	# there is no guarantee it will be on a system - and it would not be in any
-	# binpkg either. If you do something else with the firmware blobs, you are
-	# thus strongly encouraged to keep a copy of the LICENSE file with them on
-	# the system.
-	dodoc LICENSE
-	dodoc README.* CURRENT_VERSIONS
-	insinto /lib/firmware
-	# some older firmware are always provided by upstream
-	# for reasons documented in CURRENT_VERSIONS.
-
-	# Please see README.* as to why we do not use the MID/MIDX versions by
-	# default if they are newer.
-	# TODO: Provide a means to get them for people that really want them.
-	for f in ${FW_BASENAME} ; do
-		doins ${f}.*
-		latest_f="$(ls ${f}.* |grep -v MID | sort -n | tail -n1)"
-		dosym ${latest_f} /lib/firmware/${f}
-	done
-}
diff --git a/sys-block/qla-fc-firmware/qla-fc-firmware-20080423.ebuild b/sys-block/qla-fc-firmware/qla-fc-firmware-20080423.ebuild
deleted file mode 100644
index ddcac4651f67..000000000000
--- a/sys-block/qla-fc-firmware/qla-fc-firmware-20080423.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-DESCRIPTION="QLogic Linux Fibre Channel HBA Firmware for ql2xxx cards"
-HOMEPAGE="ftp://ftp.qlogic.com/outgoing/linux/firmware/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-LICENSE="qlogic-fibre-channel-firmware"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-# really depends on absolutely nothing
-DEPEND=""
-RDEPEND="!sys-kernel/linux-firmware"
-
-FW_BASENAME="ql2100_fw.bin ql2200_fw.bin ql2300_fw.bin ql2322_fw.bin ql2400_fw.bin ql2500_fw.bin ql6312_fw.bin"
-
-src_install() {
-	# We must install this, say QLogic's people.
-	# They have claimed to me that the /license/ directory isn't sufficient, as
-	# there is no guarantee it will be on a system - and it would not be in any
-	# binpkg either. If you do something else with the firmware blobs, you are
-	# thus strongly encouraged to keep a copy of the LICENSE file with them on
-	# the system.
-	dodoc LICENSE
-	dodoc README.* CURRENT_VERSIONS
-	insinto /lib/firmware
-	# some older firmware are always provided by upstream
-	# for reasons documented in CURRENT_VERSIONS.
-
-	# Please see README.* as to why we do not use the MID/MIDX versions by
-	# default if they are newer.
-	# TODO: Provide a means to get them for people that really want them.
-	for f in ${FW_BASENAME} ; do
-		doins ${f}.*
-		latest_f="$(ls ${f}.* |grep -v MID | sort -n | tail -n1)"
-		dosym ${latest_f} /lib/firmware/${f}
-	done
-}
diff --git a/sys-block/seekwatcher/Manifest b/sys-block/seekwatcher/Manifest
index 5a3e0bd1b94c..c7848cc36a75 100644
--- a/sys-block/seekwatcher/Manifest
+++ b/sys-block/seekwatcher/Manifest
@@ -1,4 +1,3 @@
 DIST seekwatcher-0.12.tar.bz2 16965 SHA256 fe8192fc0e5d63cc7ccbe68afbe85021d147a759464748507dababc4764116c5 SHA512 ac6a5469d418c640e1013bafc2097ae5f4e17cd8d720ea57ebee0350fb466abbeea90ac250989aab59061f4d00d487fc804c9171b218a21ece45f765a73a0a94 WHIRLPOOL e82c202425ec1edb3add996d54abc41327b5bbd93cfe49794d9e3800698a54ec1e068b55f9484a67ed54422e4b5f3554ceacad151ab9798e8fc3341ef0239f0a
 DIST seekwatcher-0.12_p20091015.tar.gz 105328 SHA256 e3e989ef1a978c1382d6762902813044a374598eb4c3288b634a3cf3784d4590 SHA512 fc35399900fac83bf2921a137059f1af23e65a778aad105a9cbb8bb869328723f7e2b3bb19b28e7eed04eca65a39cb637ba5932ee4f5f3a882a7b52715a9aded WHIRLPOOL 375484a490859b37ebe9704f0193ef4063c5de607c531d1be009e23c0df5fc440aaff74360fcc3b604cd139175a41be33a0cc64cd02eb7e6f76fc08da6ad7b86
 DIST seekwatcher-0.6.tar.bz2 14464 SHA256 51930792c4749886d807e2af5f6265e13fd8056656262d5a4da865c6a5435bf8 SHA512 544cca8a146deaabd17be0ec6f0e4413fa21fe162ff97676a6a7a44e46eae9d95f95b115a5cd194c9f0c1663da55dcd3d4de582ceebd0204eece2d17ec5b1277 WHIRLPOOL 7ad603b2c912a9e413ef44900279a5b600cb1f504aa620a8245f5fc5281e1a8453016e8388ceea68d83fed065fe18c7d13d7629a1d63e580f61a1e6e8759c35c
-DIST seekwatcher-0.9.tar.bz2 15909 SHA256 a46822d434193716aef366503b4897729148f11db4cec9412013a998cef3554f SHA512 26ad73d55836669b686717b2393d821b31356cc189596aea00289599c972d25aa76c0dc110228a41e6fb62bc20b958f98e560af3a61c14ae2c48477e350c1830 WHIRLPOOL e4c56b9b7bf5467d568529a7a57740f6ec3342f3a1c9c67013178bffb3757d55a13b849a7042a52f82ac2440131cf440b6de3e353e4aa2622f25140a1e2a7f18
diff --git a/sys-block/seekwatcher/seekwatcher-0.9.ebuild b/sys-block/seekwatcher/seekwatcher-0.9.ebuild
deleted file mode 100644
index 8595da7b628e..000000000000
--- a/sys-block/seekwatcher/seekwatcher-0.9.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-DESCRIPTION="Seekwatcher generates graphs from blktrace runs to help visualize IO patterns and performance"
-HOMEPAGE="http://oss.oracle.com/~mason/seekwatcher/"
-SRC_URI="http://oss.oracle.com/~mason/seekwatcher/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=">=dev-python/matplotlib-0.90.1
-		>=sys-block/btrace-0.0.20070730162628"
-
-src_install() {
-	dobin seekwatcher
-	dohtml README.html
-}
-
-pkg_postinst() {
-	elog "If you want to generate IO-movies from captured data, you must"
-	elog "install at least one of the following packages:"
-	elog "- media-video/mplayer with USE=encode"
-	elog "- media-libs/libtheora with USE=examples"
-}
diff --git a/sys-block/tw_cli/Manifest b/sys-block/tw_cli/Manifest
index 162686451067..ccd4da82b8f2 100644
--- a/sys-block/tw_cli/Manifest
+++ b/sys-block/tw_cli/Manifest
@@ -4,33 +4,17 @@ DIST cli_freebsd_10.1.zip 1500092 SHA256 f5f0eaf4ae90ec67837fa42e4e94a3f97b0b8a7
 DIST cli_freebsd_10.2.zip 1467421 SHA256 73ea166d2e569e8d9d3ecc8069fd4d6a06b1fedb9b56607360b93f393e8029b5 SHA512 2f47fd094b26415e71322ed1f1d0590988406a44fa5e7f09a45baae564ab1f391d3eb6f552a6d7c4e004ba10e707c8b415784445c379ad21ffc36ba2023006c8 WHIRLPOOL 5b43575f17e12330b99923aeb46013c6b6db806efa4ee9275d6ee01dba29104366b11fd5dfd2287e21072920b61c4783d5925cd403b9782121790164e0f325be
 DIST cli_linux_10.1.zip 1845534 SHA256 ae89aef7a309d37de76e870fc56c0dd0f08e5849eb3388e3c05a1f8b134b2be3 SHA512 8e424042f8892d4fb77664a444f2ee2a55406929013d19c79612e4d0347338b68ebf9e11cdcb2895544b53705ec9401f35581d27e34e6465e06c16a5cb60096e WHIRLPOOL 3bbcd22546cec3bf4c286b106209485a2392f8bc8c084eedec4d8c9068152fb22e5be7042b2d6ede4b7fb78cbb1b67bc9061112ad162c20c8da8879db527e700
 DIST cli_linux_10.2.zip 1813781 SHA256 405b07a2579117aa9d2866d6b449b26f716b07a07a11eb80bda910f6ff649385 SHA512 ce3446c93405fd7fec69d6b982db678a08d083d7385f392c160c794ee40ec8ed329b16e85d03f69e547e6b4b9d40882e8852dc2463b945e344443cdf8654efaa WHIRLPOOL 70e159d3c4366fbd272e1b6373d6ab3f2c54a5a71cfd46999f1277490d089043f649c9b5c0192be19a90e24ff30a91e3dc20fc730a2a2fc709a443b77e94a568
-DIST tw_cli-freebsd-x86-9.5.0.1.tgz 706413 SHA256 2f6c95d04aa583eb8d036c2ac5ca86521a04b0d979f91d01296cd2fd89c56087 SHA512 5d4638fe3ddc7cec8539757aefac10176d13e6d05a5f2d33108025032f9d75ddb492a5596c4e52508e9df4be92c4e276113d3e2122f89b48e0d240b2b084880d WHIRLPOOL 8401aa3b9efcb7ab1b87b039326c66dc0cdb3899e208d66ae729d2404709bedc7c5c493a954796465d356df7f2628b6d027f05c458b79da06d5007159aa15e3e
-DIST tw_cli-freebsd-x86-9.5.1.1.tgz 758920 SHA256 a2b99b460925df5ffa353569072e23422d92adc81ba84dcd016b8332fbdedf33 SHA512 379ec4b2a152394e2206226b955cd6e8ff904493a9c030b7b6ed2bf2fa73a273f62ea605bbe62962366b0987e5309e9b60414f5f121b548379bf1f1184ed4725 WHIRLPOOL 5c0a2d1eb9e33004d1c7ac2c0848f4fc033e45f40be89a0a9b98b75521d87cffe55a13ea75127bcd6106705b5095a435d841d133e6e8dcbbbfbfed38f1083635
 DIST tw_cli-freebsd-x86-9.5.2.tgz 785950 SHA256 a82c886066481b556d8ac415dce633352d28241a5ad84e03227225bb87234d9f SHA512 44181e6c2684637fe34cd4ad2143f713175d127bd2bc7fcf9c9a3563d939a3244da3e8b3620a123b2da173854bfc95bca91fe799261aee9913b5594a1569a8dd WHIRLPOOL cbea8c58129782db9f0b265b9035c7c09b4067622b4058acff597e2c9208f1029b3fd37f644f4e864c2189b9c75d2950d20a5aea7bdbf11956191eef089c2f06
 DIST tw_cli-freebsd-x86-9.5.3.tgz 793534 SHA256 546e5193de8cdaa267c1b29643f64865ebba04796d2c741d0b37a053402bb6b5 SHA512 ceeb072f2501c78ac56666ec13bcf0edaf047be399b16cdbd5a29b68574e10070d91611c41eb36251ca924c7532ed9df3fa397fd90b251ebf8d8a1e0befbd4d6 WHIRLPOOL 879e6ad510d5b4a6833375958e9159ce06fe3b2f55eefa6569328b5a504f08c764d945a6007b2fd032390fe0d0e2e107c234705e25587b4d395a3b217a77b142
 DIST tw_cli-linux-x86-9.2.1.1.tgz 709976 SHA256 10efc8892ce2bf68aec617449122316939435539793c53cca1fa3ab02395a46c SHA512 c706b8c710500f700736e161b8cefc821b91a9f726d1b07e74ab1114bb7d91300ebdcd59d2c0af40d98819fa9c839a03e3f4ee991e65550b0655d395a8cbb3b7 WHIRLPOOL 44851434702c5cd5e2744e114044be343b148c78ccef0a7aa7cb180e59109fa459d5401ca1a077431b2892cc326555e1f56c2668c6287e8588fd94d97c493686
-DIST tw_cli-linux-x86-9.3.0.2.tgz 848293 SHA256 4da040b77a2b1c5dd1bd12555595c067074023eeb39f817bb098b8d0a11cac4f SHA512 5409a4a3c2069d30b47534d8193e1aadfd4b29b600bf0dd94168b1099d0b00cd16e7178c8c99fab206e502098e1add2fb98b5a01f6776283d50a9881c319fb97 WHIRLPOOL a9a79efd1ac830518849905951e74ea4a97de4cfd82c9be0e878adfcee0bd0876013a1bc68ed32beaec1050c28e408ad27533673bd180e8e51c78a86a952adb1
-DIST tw_cli-linux-x86-9.3.0.3.tgz 814398 SHA256 8c49b9318154ba2ddf3af1ff978e438664e99f7beab227199aee0a4ce6055c6e SHA512 2921c628781eeffa88a9ebc04c8970d731e237de2bdde941fdd1418a6f8255bce426ef2b9ea409167577e39480407ce4dd5518813dc0dd2318ef1848170a4686 WHIRLPOOL a4147185b74d9481fc1449d7156093edd4080776ca5a6af39d0cca60d4526b788cd6eac1187cece59cbe09baae791939f328094b8a5d4034c0cf344fee16aa4c
 DIST tw_cli-linux-x86-9.3.0.4.tgz 794421 SHA256 86e8287d12c120f35a2d1e6a71b7f344c2d2750068cc4e1c9886a11b4efa235f SHA512 16539e9c486f583122a30c8dd1a7c6e5d05e7878a1ee44581f0109f8daf1a973c3549d163a4bea10b185d97b067a32f6b8c045db198e283581e949749b5588a3 WHIRLPOOL c3169d5b7cdeedca6e0e7b0c8469f41044c0e968e2962f857010afca5944457235827c62ef42d83287cf666f0d0dff48b9db59e23633edd717c130ef3c86d869
-DIST tw_cli-linux-x86-9.4.0.1.tgz 788933 SHA256 24f5beec04ac0c22ecdfef334ccb6c44a6d4587f6277cd684c50f4fca28d4be6 SHA512 d652fb4860c72b8640ba5abd9e3082f6a13de70e746f698cc37c5a5b099b4fb92ad43688f0f82175b1315a21f3b80c8d20610a16420b93858fc9dfc263371895 WHIRLPOOL 1185a8c90d6a6e71de01a900022410b625c1d8ce5be6a4dd3bde0abe6aa20749a2fd06f19be69a68b3f1f48674996e4b67ed4db6ea8769ab1ababf1f4821e2a9
-DIST tw_cli-linux-x86-9.4.0.tgz 788856 SHA256 445899d9034076ca4665183017db587dea76208dbb066ea05ec4932950b9b086 SHA512 8d4d9de59a22147d488ae4d238c8e0dd794b4ab14b7f176c17f7c6a212ed4f2129eaee633604242be28387310f49b90af82b26f36b5ba95c4baa52810a6cbe31 WHIRLPOOL 8daf77d80afbd099cd6198c7549756453b4f065c6295c3cb21388d9dc27ff91dfac54c5366031282e80383a0a0bf375a5c6417b55f11a0dd571272bf5892308d
 DIST tw_cli-linux-x86-9.4.1.2.tgz 798925 SHA256 45863a216125af3a451ee50bd47c29dfb59d19deba487469e6aa7621fd39abca SHA512 5b307c79d3fe75bb99b536b4dfa77ccd2a2a4d063c5bf492e1b429c4f4894e66b895392a9504e811a8886bc615ad0d7a06e178865c8c9a102a381f2e9341ac7a WHIRLPOOL 0103fb118cc24efd18e743998710975ecdab520a4bc489daec575faaa0ef23cd3d1c717f0c20594ba85203fad463d763a61f3ad3da899818510f9ad7d208c886
 DIST tw_cli-linux-x86-9.4.2.tgz 806428 SHA256 5197768f6a3453d7c10fbde0b0ac9f920c475d0a5525fc7ef5a4ef93594b0791 SHA512 b4a30c7e79f7ce966ca08968682e20777f43c2cecd8001caf0e6e36e3efb3418b8887a90730d88b99f9854add771bbdb9c55a217551fcb2edf49792aba8b1338 WHIRLPOOL b4fd0c85c7a7c4d7d95d73fa74c416221a02d517fd97a315afe17537ae43b6b7e5de662d3a26f6441c17bf68632b0f8baab69788438288911e30a0c932ffa0a1
-DIST tw_cli-linux-x86-9.5.0.1.tgz 866213 SHA256 a3d97622951d3eea426e18c9faa48d583376d44eee70b8765995b27e578921ab SHA512 0a80cd25ef53ac61a1eec6a916339a3d8a04d98e035809a673031676dfc46ba95957c5427f28296f5e292164117bfee5c0a3fd005d7c81b7230579321935b7f7 WHIRLPOOL f73c3e3671c900556250a4fb04b39b8a76c120c451f85518badb7cb46acdc774c6c6ef80824b555202ad33005c25e2a82b95d28009669b996d4cd8604937a6b3
-DIST tw_cli-linux-x86-9.5.0.tgz 855747 SHA256 6c0260897dd085976ce342cec02976356abe53ae9cc4f076ef113eb6c263b5ba SHA512 46d46a9200af951b553016cbf40dd2ddae05dec4f912ca229c37db1a33308ade76b27ab1e2b8d738d755401b034c98bbf82223ad3dfe39ebf019878d663180f3 WHIRLPOOL 1d4900b907031661dcf3dec3a7f5efbe0df9c397eef88806652b8ebaf44f6d05690d693b5354456cb73672df9e18dd85a8e6f4217faa0fc22c7c8ae2b3cbcb0d
-DIST tw_cli-linux-x86-9.5.1.1.tgz 920937 SHA256 5d6d9a46cc5a491f62373d372e94179e7205bbf67e0f76ea7aaafba3f3a075c0 SHA512 5b10225d451aa45491cdb355365385f9d49ebb5d8df35f8ee664f5332b01c992dd847a5b99e5e9d48fe17fcdc7dfd10372763aaf5e9a506943a9b2d811076450 WHIRLPOOL eb78aa1e6e8a1d03c8d1e41147b365b7e9d4a1b472854c79913e62b1868e8ca6790b5b20d425cbd35db99665d924eef9e3271997a0d1e6747f45435682a75c62
 DIST tw_cli-linux-x86-9.5.2.tgz 950535 SHA256 e40988424966d00c32859cd97f5b2f240464f138044139f3304fc51a77f59c3b SHA512 c10dbce0472afcc65e8cdabbf90b78c9de2a7f960582c17af667e6561524d1a63dbaeaf24bcd25ab5e602da8a3be9a100ca01b54c3387452a1a80458f5b5c077 WHIRLPOOL 02815b581eef0721985fecc67c1cbfdf79862257786257784b9db65f527664a2bdd799570e44a536bf69f84e8e7bd9ff9f38ba5fa497629aa746b2b8e464f1de
 DIST tw_cli-linux-x86-9.5.3.tgz 958837 SHA256 8330a18b782e383f518002e1d506e9298ce914609b8a37421156b4d633268127 SHA512 8f773df497b273ddcba04bface949903fa25a099d4a2d94ddb11317ce092226dee9eddebfed6be6798bdb58ebe39438acb6ed56cee57ce72b7ce34d9ab2f8094 WHIRLPOOL 179a20938f4e843d122ffe7e3ceaeed55ab1971c01970873a437e88a0589dc6daa22116edffbee1ac2775b49d1440faaa1902fe2b139dff8fe30e82e0fe9e96e
 DIST tw_cli-linux-x86_64-9.2.1.1.tgz 678634 SHA256 30fabb438c0f7e35a04a680a6bb1f17849d8d980278633dfb1538db9ffdeec85 SHA512 751a537c74383efaf004805e96c3f7edf29a18dab744f5531488ccc54b643e2929308bafea9f86751567120a803e1085315befe1b414d2eff6629e6bc0c8dab6 WHIRLPOOL 0f24d37b95a0655c0f04f271b21c55c3b46b1b614bab6cf8e03d342dbab8b94d896a0f90750c68c693afa60dc66347a29e90504a341e928f61e2ef34bae4c253
-DIST tw_cli-linux-x86_64-9.3.0.2.tgz 932845 SHA256 7b8f6c439642f7d1955a1d5f0a9d12cd108a85c8f70e974795093a74d574042f SHA512 b5fb1343dd8742ad5747c3dcc2bd2d736ee6e3312a15d20029a38d806811e15a6b1e5b28e735377d008557f7dbaf4b174a759bb902e6fd1c6968fd9da1cfca60 WHIRLPOOL 5f6c27496ce70fe7bf2ffa979d4f742c8198c41c07355c9e6bede5989216c326338d0938ac6768c171684156b5470485d295458dccc6803e98226bce585b287a
-DIST tw_cli-linux-x86_64-9.3.0.3.tgz 868867 SHA256 05e2be6a078629f542b050a67156364e67b1b1fea0cef6d3bc2533d10cab2286 SHA512 e0b66a87df63ab1e3408383936d0981853df1015448a1f16a86a3acf0dddbc282c200504b082ca9d0741edd8f8913546f3a002aa228c989dcd73e77087c5305a WHIRLPOOL fd002b14bb0136266febeb05fa6b3d4311f9ffabcdc45748b01c8b87cacf8d6f177ef63c7e46d538f55b15dd560ad13818e6246982ee5b980da5bb068c00b051
 DIST tw_cli-linux-x86_64-9.3.0.4.tgz 846293 SHA256 82cc7c4151f1fcf5b49666c2b439a992d531044c4ca590531fc27c66bc274716 SHA512 fde89108f347522487a4b47fd91332bb33566e6e3feb7818339f110c71ba89088acccbda47c4a081d04aa45e58a49483d82b4f2ab1296e1d9d8ebb178db58875 WHIRLPOOL 7a5471442be6875debd7a95c1ad5f8872ff1e1d2ec460cd859940fccd6c793731cbcaef0876cfc4015b0b77da09c4cbcdd6b5ec620f83cef2a5fecd27df6f876
-DIST tw_cli-linux-x86_64-9.4.0.1.tgz 820656 SHA256 c524ef56ad6357c13ee10b01f9d49b959c725da1b6553bfe9159c7f39fffe87b SHA512 196d5f68ae65306ebf9a9929cd1b9dec85baef071edf3a6f4076d0fdca5d9a089c531ab7914ac18a1fb8bf4a4deeb5bc4896c342d2ca19a6507a72fd354c044a WHIRLPOOL c8ef0dbbf157e3676eed8a1f71c63b4a8a287dc0a981c44adcd14d184c40703855d4bd3f9f0b3232156313e95dd941521ca747626149acd3184e01b58ab395ca
-DIST tw_cli-linux-x86_64-9.4.0.tgz 820535 SHA256 d91f861d447d49db97d24564f9458be2123ef20554ca2d2190e4b4c6fd2ff713 SHA512 97a37fbb21569bb9ab59d2668203747bf2670d37b4ef29d76b85ab25f56838100f926505875078b77161db4887a4b3d05bf259342c03d69a0cb8198be79bfb42 WHIRLPOOL e09dee4994dce7f371fc6faad62d0c79a4db9b2a223057d8bb57d60316bbb3c170141c25f4932801f899d5b97f8a3069c4cd6bf7dc7d803a707f95cfe9faa904
 DIST tw_cli-linux-x86_64-9.4.1.2.tgz 831001 SHA256 a5dafa136b48c72a92043aa4ab6381063266cfc7188f0054a1c8cd953d7a30a2 SHA512 15ca392105662f9c59c643b351672e922992350b973cceb946127b0a285fc93b7d36b6e67483010043b0f945bb256d4380ef99a8c404368a4113a8e297a07e79 WHIRLPOOL af571818e4a835b507c019ea549d91c2a1f2ec5f0263c1c68318b296937360e8e6d79f052b532d6d0b227aec8073fbd5349932af647f5b0b0e7d600ae173fbed
 DIST tw_cli-linux-x86_64-9.4.2.tgz 837638 SHA256 488f1c1b497541f199ef2de7f168c56e9142ed74d59ad3ce52c20a890c5ac0c3 SHA512 bf6b571c4620618be2099df526ebf347881280bd6e60f5b38051b16cf61d88f265ac58604a6d58d4c6c37f960ec8cb370c060cdf1feabcbb0253a4b6dff54050 WHIRLPOOL 09be39e56a1aaf8fb7932e4ac847e10af83c33da4696185d6df824db77d0f5eb529055211ba693bf53b97113d8ad33f7b7685cfa835d33384eab37bb5bf55af7
-DIST tw_cli-linux-x86_64-9.5.0.1.tgz 895959 SHA256 87e0476374a60dcb23308e0bf4f3a7f1978fd1a32a82c39152bdc3a93541d9b1 SHA512 6e2dd3c703a79d6e904235dd9442953ff3407a928bec4eaf663258515c473225ca0e8cda7c230f4d1b59ff2a4652139f831677202f8b3bb3b5e4acf196f8e6b4 WHIRLPOOL 22989ef41c85d3394303f99c7031b655a7ddc47aaf3c69dc19f1dfaf0322498b79212a5d8349282aadd38e2476960b5821ac9aa1ad2d2ec58227810c0c59a308
-DIST tw_cli-linux-x86_64-9.5.0.tgz 886882 SHA256 b7a8085621c599da5063ca459dbc9e823b6ee40c3c2f9543f01fbdaa1e128396 SHA512 e0c6595c709129c2ee9fe338913907a5cc6fd75862e50ab4729463ec2cccf4c92e75f5ecf148554a71b5612ec1c5f92c3d094813360c025745884c1f8b79f972 WHIRLPOOL a12480629050f422d7e05585350866d644b1e926d1ee88c846d7e8de19459256bcea776c3d0b35b377c5beefcd300d7617ad0d24a833a80b06b4662f91fe0a62
-DIST tw_cli-linux-x86_64-9.5.1.1.tgz 949532 SHA256 73c776364a3342db8d9dcbffd73c202b840f7c95d3e567f87133bf3acb71566f SHA512 bde92367cec871897b2618e09699be0a6d996e6a49fbaa67b1584a85e9ce59aaf2142ac5289c473bccdae260aa2538f87da0108ed5368ee6cc22426213f0d48f WHIRLPOOL 67a89c4677e0446ee1e90ac35bbb5e5d1e08ba99e0f9d390b756f775510b6900f2227fabb8df2c3de9bfb751336a5ac0dcd99eba436a58e21c29adadcf658248
 DIST tw_cli-linux-x86_64-9.5.2.tgz 979071 SHA256 2e00233fd4e591220d4732dbc766ae9af5655ba8c000cb4f24504a593455b437 SHA512 de0c71769933e18a9f8e6b12875f97856051bb8c7ec1fe7a365c74b8ddf5773aba6c89628f677b6d5116d3f2933c38ad14a83c289e2fc9a6ae91391b4db36191 WHIRLPOOL d5d9f56931ac3023ad85aa7927759630f37887f1264ebb9cb25181ab7014739a0c728b9a42634f99503a569d2badaeb813571d93743e22aa0bb2078d7d0c6f66
 DIST tw_cli-linux-x86_64-9.5.3.tgz 986751 SHA256 3fd481b69b3a90abafe32966bf30040db89c70836d9d9536f21e0ab641f64ce6 SHA512 5042c3b3499ae67ab0001212ee4906be2a4f8eeac55d1271f7a9880af656c5cb16b526c914b07993b950943eee677d814ee8c4dd9aabac2de8c213451ace5797 WHIRLPOOL 70eab6ea9716bb149489c3cb8567b281f35f3164ae5326d4f60e32d9705e2588deccaf03e7ba84b9300042449dffbe6326bd467fc2e8ca410f8babeb5c039207
diff --git a/sys-block/tw_cli/tw_cli-9.3.0.2.ebuild b/sys-block/tw_cli/tw_cli-9.3.0.2.ebuild
deleted file mode 100644
index 5e5f0efb007f..000000000000
--- a/sys-block/tw_cli/tw_cli-9.3.0.2.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-DESCRIPTION="3ware SATA+PATA RAID controller Command Line Interface tool"
-HOMEPAGE="http://www.3ware.com/"
-LICENSE="3ware"
-SLOT="0"
-# binary packages
-KEYWORDS="-* ~x86 ~amd64"
-IUSE=""
-# stripping seems to break this sometimes
-RESTRICT="fetch strip mirror"
-# binary packages
-DEPEND=""
-RDEPEND=""
-MY_P="${PN}-linux-${ARCH/amd64/x86_64}-${PV}"
-# package has different tarballs for x86 and amd64
-SRC_URI_BASE="http://www.3ware.com/download/Escalade9000Series/${PV}"
-SRC_URI="x86? ( ${SRC_URI_BASE}/${PN}-linux-x86-${PV}.tgz )
-		 amd64? ( ${SRC_URI_BASE}/${PN}-linux-x86_64-${PV}.tgz )"
-# x86: http://3ware.com/support/download_9.3.0.2.asp?SNO=616
-# amd64: http://3ware.com/support/download_9.3.0.2.asp?SNO=617
-DOWNLOAD_URL="http://www.3ware.com/support/windows_agree.asp?path=/download/Escalade9000Series/${PV}/${MY_P}.tgz"
-S="${WORKDIR}"
-
-src_unpack() {
-	unpack ${MY_P}.tgz
-}
-
-supportedcards() {
-	einfo "This binary supports all current cards, including, but not"
-	einfo "limited to:"
-	einfo ""
-	einfo "PATA: 7210, 7410, 7450, 7810, 7850, 7000-2, 7500-4, 7500-8,"
-	einfo "      7500-12, 7006-2, 7506-4, 7506-4LP, 7506-8, 7506-12"
-	einfo ""
-	einfo "SATA: 8500-4, 8500-8, 8500-12, 8006-2, 8506-4, 8506-12,"
-	einfo "      8506-8MI, 8506-12MI, 9500S-4LP, 9500S-8, 9500S-12,"
-	einfo "      9500S-8MI, 9500S-12MI"
-}
-
-pkg_setup() {
-	supportedcards
-}
-
-pkg_nofetch() {
-	einfo "Please agree to the license at URL"
-	einfo ""
-	einfo "\t${DOWNLOAD_URL}"
-	einfo ""
-	einfo "And then use the following URL to download the"
-	einfo "correct tarball into ${DISTDIR}"
-	einfo ""
-	einfo "\t${SRC_URI}"
-	einfo ""
-	supportedcards
-}
-
-src_install() {
-	into /
-	dosbin tw_cli
-	dosbin tw_sched
-	insinto /etc
-	doins tw_sched.cfg
-	into /usr
-	newman tw_cli.8.nroff tw_cli.8
-	newman tw_sched.8.nroff tw_sched.8
-	dohtml *.html
-}
diff --git a/sys-block/tw_cli/tw_cli-9.3.0.3.ebuild b/sys-block/tw_cli/tw_cli-9.3.0.3.ebuild
deleted file mode 100644
index b2801049fa5b..000000000000
--- a/sys-block/tw_cli/tw_cli-9.3.0.3.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-DESCRIPTION="3ware SATA+PATA RAID controller Command Line Interface tool"
-HOMEPAGE="http://www.3ware.com/"
-LICENSE="3ware"
-SLOT="0"
-# binary packages
-KEYWORDS="-* ~x86 ~amd64"
-IUSE=""
-# stripping seems to break this sometimes
-RESTRICT="fetch strip mirror"
-# binary packages
-DEPEND=""
-RDEPEND=""
-MY_P="${PN}-linux-${ARCH/amd64/x86_64}-${PV}"
-# package has different tarballs for x86 and amd64
-SRC_URI_BASE="http://www.3ware.com/download/Escalade7000Series/${PV}"
-SRC_URI="x86? ( ${SRC_URI_BASE}/${PN}-linux-x86-${PV}.tgz )
-		 amd64? ( ${SRC_URI_BASE}/${PN}-linux-x86_64-${PV}.tgz )"
-# x86: http://3ware.com/support/download_9.3.0.2.asp?SNO=616
-# amd64: http://3ware.com/support/download_9.3.0.2.asp?SNO=617
-DOWNLOAD_URL="http://www.3ware.com/support/windows_agree.asp?path=/download/Escalade7000Series/${PV}/${MY_P}.tgz"
-S="${WORKDIR}"
-
-src_unpack() {
-	unpack ${MY_P}.tgz
-}
-
-supportedcards() {
-	einfo "This binary supports should support ALL cards, including, but not"
-	einfo "limited to:"
-	einfo ""
-	einfo "PATA: 6xxx, 7210, 7410, 7450, 7810, 7850, 7000-2, 7500-4, 7500-8,"
-	einfo "		7500-12, 7006-2, 7506-4, 7506-4LP, 7506-8, 7506-12"
-	einfo ""
-	einfo "SATA: 8500-4, 8500-8, 8500-12, 8006-2, 8506-4, 8506-12,"
-	einfo "      8506-8MI, 8506-12MI, 9500S-4LP, 9500S-8, 9500S-12,"
-	einfo "      9500S-8MI, 9500S-12MI"
-}
-
-pkg_setup() {
-	supportedcards
-}
-
-pkg_nofetch() {
-	einfo "Please agree to the license at URL"
-	einfo ""
-	einfo "\t${DOWNLOAD_URL}"
-	einfo ""
-	einfo "And then use the following URL to download the"
-	einfo "correct tarball into ${DISTDIR}"
-	einfo ""
-	einfo "\t${SRC_URI}"
-	einfo ""
-	supportedcards
-}
-
-src_install() {
-	into /
-	dosbin tw_cli
-	dosbin tw_sched
-	insinto /etc
-	doins tw_sched.cfg
-	into /usr
-	newman tw_cli.8.nroff tw_cli.8
-	newman tw_sched.8.nroff tw_sched.8
-	dohtml *.html
-}
diff --git a/sys-block/tw_cli/tw_cli-9.4.0.1.ebuild b/sys-block/tw_cli/tw_cli-9.4.0.1.ebuild
deleted file mode 100644
index 6665cec982c8..000000000000
--- a/sys-block/tw_cli/tw_cli-9.4.0.1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-DESCRIPTION="3ware SATA+PATA RAID controller Command Line Interface tool"
-HOMEPAGE="http://www.3ware.com/"
-LICENSE="3ware"
-SLOT="0"
-# binary packages
-KEYWORDS="-* ~amd64 ~x86"
-IUSE=""
-# stripping seems to break this sometimes
-RESTRICT="fetch strip mirror"
-# binary packages
-DEPEND=""
-RDEPEND=""
-MY_P="${PN}-linux-${ARCH/amd64/x86_64}-${PV}"
-# Upstream actually only releases newer versions for new hardware
-# and doesn't release new major versions for old hardware
-# however their backwards compatibility is excellent.
-# I personally test tw_cli on two cards: 6200 (amd64) and 7006-2 (x86)
-# - Robin H. Johnson <robbat2@gentoo.org> - 23 Nov 2006
-#HW_VARIANT="Escalade7000Series" - for versions 9.3.0.*
-HW_VARIANT="Escalade9650SE-Series" # for versions 9.4.0*
-# package has different tarballs for x86 and amd64
-SRC_URI_BASE="http://www.3ware.com/download/${HW_VARIANT}/${PV}"
-SRC_URI_x86="${SRC_URI_BASE}/${PN}-linux-x86-${PV}.tgz"
-SRC_URI_amd64="${SRC_URI_BASE}/${PN}-linux-x86_64-${PV}.tgz"
-SRC_URI="x86? ( ${SRC_URI_x86} )
-		 amd64? ( ${SRC_URI_amd64} )"
-LICENSE_URL="http://www.3ware.com/support/windows_agree.asp?path=/download/${HW_VARIANT}/${PV}/${MY_P}.tgz"
-S="${WORKDIR}"
-
-src_unpack() {
-	unpack ${MY_P}.tgz
-}
-
-supportedcards() {
-	elog "This binary supports should support ALL cards, including, but not"
-	elog "limited to the following series:"
-	elog ""
-	elog "PATA: 6xxx, 72xx, 74xx, 78xx, 7000, 7500, 7506"
-	elog "SATA: 8006, 8500, 8506, 9500S, 9550SX, 9590SE"
-	elog "      9550SXU, 9650SE"
-	elog ""
-	elog "Release notes for this version are available at:"
-	elog "${SRC_URI_BASE}/${PV}_Release_Notes_Web.pdf"
-}
-
-pkg_setup() {
-	supportedcards
-}
-
-pkg_nofetch() {
-	einfo "Please agree to the license at URL"
-	einfo ""
-	einfo "\t${LICENSE_URL}"
-	einfo ""
-	einfo "And then use the following URL to download the"
-	einfo "correct tarball into ${DISTDIR}"
-	einfo ""
-	einfo "x86 - ${SRC_URI_x86}"
-	einfo "amd64 - ${SRC_URI_amd64}"
-	einfo ""
-	supportedcards
-}
-
-src_install() {
-	into /
-	dosbin tw_cli
-	dosbin tw_sched
-	insinto /etc
-	doins tw_sched.cfg
-	into /usr
-	newman tw_cli.8.nroff tw_cli.8
-	newman tw_sched.8.nroff tw_sched.8
-	dohtml *.html
-}
diff --git a/sys-block/tw_cli/tw_cli-9.4.0.ebuild b/sys-block/tw_cli/tw_cli-9.4.0.ebuild
deleted file mode 100644
index cb4dd903f697..000000000000
--- a/sys-block/tw_cli/tw_cli-9.4.0.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-DESCRIPTION="3ware SATA+PATA RAID controller Command Line Interface tool"
-HOMEPAGE="http://www.3ware.com/"
-LICENSE="3ware"
-SLOT="0"
-# binary packages
-KEYWORDS="-* amd64 x86"
-IUSE=""
-# stripping seems to break this sometimes
-RESTRICT="fetch strip mirror"
-# binary packages
-DEPEND=""
-RDEPEND=""
-MY_P="${PN}-linux-${ARCH/amd64/x86_64}-${PV}"
-# Upstream actually only releases newer versions for new hardware
-# and doesn't release new major versions for old hardware
-# however their backwards compatibility is excellent.
-# I personally test tw_cli on two cards: 6200 (amd64) and 7006-2 (x86)
-# - Robin H. Johnson <robbat2@gentoo.org> - 23 Nov 2006
-#HW_VARIANT="Escalade7000Series" - for versions 9.3.0.*
-HW_VARIANT="Escalade9650SE-Series" # for versions 9.4.0*
-# package has different tarballs for x86 and amd64
-SRC_URI_BASE="http://www.3ware.com/download/${HW_VARIANT}/${PV}"
-SRC_URI="x86? ( ${SRC_URI_BASE}/${PN}-linux-x86-${PV}.tgz )
-		 amd64? ( ${SRC_URI_BASE}/${PN}-linux-x86_64-${PV}.tgz )"
-DOWNLOAD_URL="http://www.3ware.com/support/windows_agree.asp?path=/download/${HW_VARIANT}/${PV}/${MY_P}.tgz"
-S="${WORKDIR}"
-
-src_unpack() {
-	unpack ${MY_P}.tgz
-}
-
-supportedcards() {
-	einfo "This binary supports should support ALL cards, including, but not"
-	einfo "limited to the following series:"
-	einfo ""
-	einfo "PATA: 6xxx, 72xx, 74xx, 78xx, 7000, 7500, 7506"
-	einfo "SATA: 8006, 8500, 8506, 9500S, 9550SX, 9590SE"
-	einfo "      9550SXU, 9650SE"
-	einfo ""
-	einfo "Release notes for this version are available at:"
-	einfo "${SRC_URI_BASE}/${PV}_Release_Notes_Web.pdf"
-}
-
-pkg_setup() {
-	supportedcards
-}
-
-pkg_nofetch() {
-	einfo "Please agree to the license at URL"
-	einfo ""
-	einfo "\t${DOWNLOAD_URL}"
-	einfo ""
-	einfo "And then use the following URL to download the"
-	einfo "correct tarball into ${DISTDIR}"
-	einfo ""
-	einfo "\t${SRC_URI}"
-	einfo ""
-	supportedcards
-}
-
-src_install() {
-	into /
-	dosbin tw_cli
-	dosbin tw_sched
-	insinto /etc
-	doins tw_sched.cfg
-	into /usr
-	newman tw_cli.8.nroff tw_cli.8
-	newman tw_sched.8.nroff tw_sched.8
-	dohtml *.html
-}
diff --git a/sys-block/tw_cli/tw_cli-9.5.0.1.ebuild b/sys-block/tw_cli/tw_cli-9.5.0.1.ebuild
deleted file mode 100644
index a73a69761b1c..000000000000
--- a/sys-block/tw_cli/tw_cli-9.5.0.1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-DESCRIPTION="3ware SATA+PATA RAID controller Command Line Interface tool"
-HOMEPAGE="https://www.3ware.com/3warekb/article.aspx?id=14847"
-LICENSE="3ware"
-SLOT="0"
-# binary packages
-KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
-IUSE=""
-# stripping seems to break this sometimes
-RESTRICT="fetch strip mirror"
-# binary packages
-DEPEND=""
-RDEPEND=""
-
-# Upstream has _FUN_ naming these
-# We are mostly prepared for the FreeBSD binaries at this point
-# They just aren't yet enabled here
-PN_KERNEL="${ARCH/*fbsd-*/freebsd}"
-[ "${PN_KERNEL}" != 'freebsd' ] && PN_KERNEL='linux'
-PN_ARCH="${ARCH/*-}"
-PN_ARCH="${PN_ARCH/amd64/x86_64}"
-
-# The naming of <=9.5.0 for freebsd was weird,
-# but 9.5.0.1 has it sanely.
-MY_P="${PN}-${PN_KERNEL}-${PN_ARCH}-${PV}"
-
-# Upstream actually only releases newer versions for new hardware
-# and doesn't release new major versions for old hardware
-# however their backwards compatibility is excellent.
-# I personally test tw_cli on two cards: 6200 (amd64) and 7006-2 (x86)
-# - Robin H. Johnson <robbat2@gentoo.org> - 23 Nov 2006
-#HW_VARIANT="Escalade7000Series" - for versions 9.3.0.*
-#HW_VARIANT="Escalade9650SE-Series" # for versions 9.4.0*
-HW_VARIANT="Escalade9690SA-Series" # for versions 9.5.0*
-# package has different tarballs for x86 and amd64
-SRC_URI_BASE="http://www.3ware.com/download/${HW_VARIANT}/${PV}"
-SRC_URI_x86="${SRC_URI_BASE}/${PN}-linux-x86-${PV}.tgz"
-SRC_URI_amd64="${SRC_URI_BASE}/${PN}-linux-x86_64-${PV}.tgz"
-SRC_URI_x86_fbsd="${SRC_URI_BASE}/${PN}-freebsd-x86-${PV}.tgz"
-#SRC_URI_amd64_fbsd="${SRC_URI_BASE}/${PN}-x86_64-freebsd-${PV}.tgz"
-SRC_URI="x86?   ( ${SRC_URI_x86} )
-		 amd64? ( ${SRC_URI_amd64} )
-		 x86-fbsd? ( ${SRC_URI_x86_fbsd} )"
-		#amd64-fbsd? ( ${SRC_URI_amd64_fbsd} )
-LICENSE_URL="http://www.3ware.com/support/windows_agree.asp?path=/download/${HW_VARIANT}/${PV}/${MY_P}.tgz"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	unpack ${MY_P}.tgz
-}
-
-supportedcards() {
-	elog "This binary supports should support ALL cards, including, but not"
-	elog "limited to the following series:"
-	elog ""
-	elog "PATA: 6xxx, 72xx, 74xx, 78xx, 7000, 7500, 7506"
-	elog "SATA: 8006, 8500, 8506, 9500S, 9550SX, 9590SE,"
-	elog "      9550SXU, 9650SE, 9650SE-{24M8,4LPME},"
-	elog "      9690SA"
-	elog ""
-	elog "Release notes for this version are available at:"
-	elog "${SRC_URI_BASE}/${PV}_Release_Notes_Web.pdf"
-}
-
-pkg_setup() {
-	supportedcards
-}
-
-pkg_nofetch() {
-	einfo "Please agree to the license at URL"
-	einfo ""
-	einfo "\t${LICENSE_URL}"
-	einfo ""
-	einfo "And then use the following URL to download the"
-	einfo "correct tarball into ${DISTDIR}"
-	einfo ""
-	einfo "x86 - ${SRC_URI_x86}"
-	einfo "amd64 - ${SRC_URI_amd64}"
-	einfo "x86-fbsd - ${SRC_URI_x86_fbsd}"
-	#einfo "amd64-fbsd - ${SRC_URI_amd64_fbsd}"
-	einfo ""
-	supportedcards
-}
-
-src_install() {
-	into /
-	dosbin tw_cli
-	into /usr
-	newman tw_cli.8.nroff tw_cli.8
-	dohtml *.html
-}
diff --git a/sys-block/tw_cli/tw_cli-9.5.0.ebuild b/sys-block/tw_cli/tw_cli-9.5.0.ebuild
deleted file mode 100644
index 2555c9046f3a..000000000000
--- a/sys-block/tw_cli/tw_cli-9.5.0.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-DESCRIPTION="3ware SATA+PATA RAID controller Command Line Interface tool"
-HOMEPAGE="https://www.3ware.com/3warekb/article.aspx?id=14847"
-LICENSE="3ware"
-SLOT="0"
-# binary packages
-KEYWORDS="-* ~amd64 ~x86"
-IUSE=""
-# stripping seems to break this sometimes
-RESTRICT="fetch strip mirror"
-# binary packages
-DEPEND=""
-RDEPEND=""
-
-# Upstream has _FUN_ naming these
-# We are mostly prepared for the FreeBSD binaries at this point
-# They just aren't yet enabled here
-PN_KERNEL="${ARCH/*fbsd-*/freebsd}"
-[ "${PN_KERNEL}" != 'freebsd' ] && PN_KERNEL='linux'
-PN_ARCH="${ARCH/*-}"
-PN_ARCH="${PN_ARCH/amd64/x86_64}"
-
-if [ "${PN_KERNEL}" == 'freebsd' ]; then
-	MY_P="${PN}-${PN_ARCH}-${PN_KERNEL}-${PV}"
-else
-	MY_P="${PN}-${PN_KERNEL}-${PN_ARCH}-${PV}"
-fi
-# Upstream actually only releases newer versions for new hardware
-# and doesn't release new major versions for old hardware
-# however their backwards compatibility is excellent.
-# I personally test tw_cli on two cards: 6200 (amd64) and 7006-2 (x86)
-# - Robin H. Johnson <robbat2@gentoo.org> - 23 Nov 2006
-#HW_VARIANT="Escalade7000Series" - for versions 9.3.0.*
-#HW_VARIANT="Escalade9650SE-Series" # for versions 9.4.0*
-HW_VARIANT="Escalade9690SA-Series" # for versions 9.5.0*
-# package has different tarballs for x86 and amd64
-SRC_URI_BASE="http://www.3ware.com/download/${HW_VARIANT}/${PV}"
-SRC_URI_x86="${SRC_URI_BASE}/${PN}-linux-x86-${PV}.tgz"
-SRC_URI_amd64="${SRC_URI_BASE}/${PN}-linux-x86_64-${PV}.tgz"
-#SRC_URI_x86_fbsd="${SRC_URI_BASE}/${PN}-x86-freebsd-${PV}.tgz"
-#SRC_URI_amd64_fbsd="${SRC_URI_BASE}/${PN}-x86_64-freebsd-${PV}.tgz"
-SRC_URI="x86?   ( ${SRC_URI_x86} )
-		 amd64? ( ${SRC_URI_amd64} )"
-		#x86-fbsd? ( ${SRC_URI_x86_fbsd} )
-		#amd64-fbsd? ( ${SRC_URI_amd64_fbsd} )
-LICENSE_URL="http://www.3ware.com/support/windows_agree.asp?path=/download/${HW_VARIANT}/${PV}/${MY_P}.tgz"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${MY_P}.tgz
-}
-
-supportedcards() {
-	elog "This binary supports should support ALL cards, including, but not"
-	elog "limited to the following series:"
-	elog ""
-	elog "PATA: 6xxx, 72xx, 74xx, 78xx, 7000, 7500, 7506"
-	elog "SATA: 8006, 8500, 8506, 9500S, 9550SX, 9590SE,"
-	elog "      9550SXU, 9650SE, 9650SE-{24M8,4LPME},"
-	elog "      9690SA"
-	elog ""
-	elog "Release notes for this version are available at:"
-	elog "${SRC_URI_BASE}/${PV}_Release_Notes_Web.pdf"
-}
-
-pkg_setup() {
-	supportedcards
-}
-
-pkg_nofetch() {
-	einfo "Please agree to the license at URL"
-	einfo ""
-	einfo "\t${LICENSE_URL}"
-	einfo ""
-	einfo "And then use the following URL to download the"
-	einfo "correct tarball into ${DISTDIR}"
-	einfo ""
-	einfo "x86 - ${SRC_URI_x86}"
-	einfo "amd64 - ${SRC_URI_amd64}"
-	#einfo "x86-fbsd - ${SRC_URI_x86_fbsd}"
-	#einfo "amd64-fbsd - ${SRC_URI_amd64_fbsd}"
-	einfo ""
-	supportedcards
-}
-
-src_install() {
-	into /
-	dosbin tw_cli
-	dosbin tw_sched
-	insinto /etc
-	doins tw_sched.cfg
-	into /usr
-	newman tw_cli.8.nroff tw_cli.8
-	newman tw_sched.8.nroff tw_sched.8
-	dohtml *.html
-}
diff --git a/sys-block/tw_cli/tw_cli-9.5.1.1.ebuild b/sys-block/tw_cli/tw_cli-9.5.1.1.ebuild
deleted file mode 100644
index 63bff042fa21..000000000000
--- a/sys-block/tw_cli/tw_cli-9.5.1.1.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-DESCRIPTION="3ware SATA+PATA RAID controller Command Line Interface tool"
-HOMEPAGE="https://www.3ware.com/3warekb/article.aspx?id=14847"
-LICENSE="3ware"
-SLOT="0"
-# binary packages
-KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
-IUSE=""
-# stripping seems to break this sometimes
-RESTRICT="fetch strip mirror"
-# binary packages
-DEPEND=""
-RDEPEND=""
-
-# Upstream has _FUN_ naming these
-# We are mostly prepared for the FreeBSD binaries at this point
-# They just aren't yet enabled here
-PN_KERNEL="${ARCH/*fbsd-*/freebsd}"
-[ "${PN_KERNEL}" != 'freebsd' ] && PN_KERNEL='linux'
-PN_ARCH="${ARCH/*-}"
-PN_ARCH="${PN_ARCH/amd64/x86_64}"
-
-# The naming of <=9.5.0 for freebsd was weird,
-# but 9.5.0.1 has it sanely.
-MY_P="${PN}-${PN_KERNEL}-${PN_ARCH}-${PV}"
-
-# Upstream actually only releases newer versions for new hardware
-# and doesn't release new major versions for old hardware
-# however their backwards compatibility is excellent.
-# I personally test tw_cli on 4 cards:
-# 7006-2 on x86.
-# 9500S-8 on amd64.
-# 9500S-4LP on amd64.
-# 9650SE-8LPML on amd64.
-# - Robin H. Johnson <robbat2@gentoo.org> - 23 Nov 2006
-#HW_VARIANT="Escalade7000Series" - for versions 9.3.0.*
-#HW_VARIANT="Escalade9650SE-Series" # for versions 9.4.0*
-HW_VARIANT="Escalade9690SA-Series" # for versions 9.5.0*
-# package has different tarballs for x86 and amd64
-SRC_URI_BASE="http://www.3ware.com/download/${HW_VARIANT}/${PV}"
-SRC_URI_x86="${SRC_URI_BASE}/${PN}-linux-x86-${PV}.tgz"
-SRC_URI_amd64="${SRC_URI_BASE}/${PN}-linux-x86_64-${PV}.tgz"
-SRC_URI_x86_fbsd="${SRC_URI_BASE}/${PN}-freebsd-x86-${PV}.tgz"
-#SRC_URI_amd64_fbsd="${SRC_URI_BASE}/${PN}-x86_64-freebsd-${PV}.tgz"
-SRC_URI="x86?   ( ${SRC_URI_x86} )
-		 amd64? ( ${SRC_URI_amd64} )
-		 x86-fbsd? ( ${SRC_URI_x86_fbsd} )"
-		#amd64-fbsd? ( ${SRC_URI_amd64_fbsd} )
-LICENSE_URL="http://www.3ware.com/support/windows_agree.asp?path=/download/${HW_VARIANT}/${PV}/${MY_P}.tgz"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	unpack ${MY_P}.tgz
-}
-
-supportedcards() {
-	elog "This binary supports should support ALL cards, including, but not"
-	elog "limited to the following series:"
-	elog ""
-	elog "PATA: 6xxx, 72xx, 74xx, 78xx, 7000, 7500, 7506"
-	elog "SATA: 8006, 8500, 8506, 9500S, 9550SX, 9590SE,"
-	elog "      9550SXU, 9650SE, 9650SE-{24M8,4LPME},"
-	elog "      9690SA"
-	elog ""
-	elog "Release notes for this version are available at:"
-	elog "${SRC_URI_BASE}/${PV}_Release_Notes_Web.pdf"
-}
-
-pkg_setup() {
-	supportedcards
-}
-
-pkg_nofetch() {
-	einfo "Please agree to the license at URL"
-	einfo ""
-	einfo "\t${LICENSE_URL}"
-	einfo ""
-	einfo "And then use the following URL to download the"
-	einfo "correct tarball into ${DISTDIR}"
-	einfo ""
-	einfo "x86 - ${SRC_URI_x86}"
-	einfo "amd64 - ${SRC_URI_amd64}"
-	einfo "x86-fbsd - ${SRC_URI_x86_fbsd}"
-	#einfo "amd64-fbsd - ${SRC_URI_amd64_fbsd}"
-	einfo ""
-	supportedcards
-}
-
-src_install() {
-	into /
-	dosbin tw_cli
-	into /usr
-	newman tw_cli.8.nroff tw_cli.8
-	dohtml *.html
-}
diff --git a/sys-fs/mtd-utils/files/mtd-utils-1.5.2-sysmacros.patch b/sys-fs/mtd-utils/files/mtd-utils-1.5.2-sysmacros.patch
new file mode 100644
index 000000000000..5fc055d07da9
--- /dev/null
+++ b/sys-fs/mtd-utils/files/mtd-utils-1.5.2-sysmacros.patch
@@ -0,0 +1,32 @@
+https://bugs.gentoo.org/580206
+
+From 9a06f45ec71116d76ee4b268ebe1b33d45b06fc0 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Sat, 16 Apr 2016 22:10:43 -0400
+Subject: [PATCH mtd-utils] include sys/sysmacros.h for major/minor/makedev
+
+These functions have always been defined in sys/sysmacros.h under
+Linux C libraries.  For some, including sys/types.h implicitly
+includes that as well, but glibc wants to deprecate that, and some
+others already have.  Include the header explicitly for the funcs.
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ include/common.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/include/common.h b/include/common.h
+index fb0ca83..8cb3142 100644
+--- a/include/common.h
++++ b/include/common.h
+@@ -28,6 +28,7 @@
+ #include <errno.h>
+ #include <features.h>
+ #include <inttypes.h>
++#include <sys/sysmacros.h>
+ #include "version.h"
+ 
+ #ifndef PROGRAM_NAME
+-- 
+2.7.4
+
diff --git a/sys-fs/mtd-utils/mtd-utils-1.5.2.ebuild b/sys-fs/mtd-utils/mtd-utils-1.5.2.ebuild
index 26c0a62d42d7..176261d254e4 100644
--- a/sys-fs/mtd-utils/mtd-utils-1.5.2.ebuild
+++ b/sys-fs/mtd-utils/mtd-utils-1.5.2.ebuild
@@ -40,6 +40,10 @@ RDEPEND="!sys-fs/mtd
 DEPEND="${RDEPEND}
 	xattr? ( sys-apps/acl )"
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-sysmacros.patch #580206
+}
+
 makeopts() {
 	# These affect build output, so keep it common between compile & install.
 	echo CROSS=${CHOST}- V=1
diff --git a/sys-process/memwatch/Manifest b/sys-process/memwatch/Manifest
index c2d27b8f527e..05afdd16b8c6 100644
--- a/sys-process/memwatch/Manifest
+++ b/sys-process/memwatch/Manifest
@@ -1 +1,2 @@
 DIST memwatch-0.0.2.tar.gz 3342 SHA256 7eab256e6e2ebd1e302b5f40567b849b8e0f33e08179c9e35d4cfa55b194cf59 SHA512 79af7056023128a1a27150ba02d29fdd51dbfe79ae44acf36a149dded6940ba209967ef1729e77063e93cf4d85861d993eb44f38cdb5b42254ed4d8bc77e5235 WHIRLPOOL 8005051534441497a4494b12ee85a87c88c39396a47fe8794be24bbbb1758f0a3963bd8623e4c083c8e3c8be6c966a05687741595a8ed23d698d273081aedbb9
+DIST memwatch-0.1.0.tar.gz 6733 SHA256 72002e7d9c3a9053404710982bb782cfcdc20abe8b6c0fabdcb78d8a3a69ddb9 SHA512 9adcc65640fcbc252b15a48502ddd705e6f3b2bcf5e3cbd3ad61e640d6921af29f9fb5f086cb71e6badecda3d2f64e76b308d65b70a0d9b70dafb4f608f1f0f0 WHIRLPOOL 8d8fe7aa9cfeec42f012b6d2a34622776dd2d1b1e1900a754acca7990c4c1205db0bdf12709e643f8ddfaed7d1e3efe14c2075ef43e1ca955ddb504b26caf8f5
diff --git a/sys-process/memwatch/memwatch-0.1.0.ebuild b/sys-process/memwatch/memwatch-0.1.0.ebuild
new file mode 100644
index 000000000000..909038e6234f
--- /dev/null
+++ b/sys-process/memwatch/memwatch-0.1.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit cmake-utils
+
+DESCRIPTION="Interactive memory viewer"
+HOMEPAGE="https://bitbucket.org/PascalRD/memwatch/"
+SRC_URI="http://unixdev.ru/src/${P}.tar.gz"
+
+LICENSE="WTFPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="sys-libs/ncurses:0="
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_install() {
+	cmake-utils_src_install
+}
diff --git a/sys-process/procenv/Manifest b/sys-process/procenv/Manifest
index cace153d47e5..047785ac3aa5 100644
--- a/sys-process/procenv/Manifest
+++ b/sys-process/procenv/Manifest
@@ -1,4 +1,2 @@
-DIST procenv-0.35.tar.gz 251995 SHA256 4b5e9bdf0e7ee7ff63548f380258407bfee64618734db31f33adc332ce02be26 SHA512 c9dab048adba7c3cb659b91aaea5c090d2919a0f38ac53920c433e5888e29d7b0072ca5ba76c4c71cc5d45402dff47dbaee663ff3a3c045e4127032c7467fa49 WHIRLPOOL c186319546607c3fb22bcf97f6ee41099016c777c615a94165624c5934c303f1d2492aa6a54cd15e5e0323abc1c683fd0b16b2ab0825315d4e28abf8f2048b97
-DIST procenv-0.36.tar.gz 264248 SHA256 70550499d0602ffbb4bbbe91c1a6d468d44589ab29b74b5ccc42b9558f970fb4 SHA512 0a054541a2ec08aa147f2f6b222bc7c17ce9e5f7f96fae512bfd569572277566e3b3a55ab876668b2678d54b16272427ececfdba5fde2144f18ae992f892d9e9 WHIRLPOOL 100b20b0b9b17fdb5de0e8defe7bd987743bd8c6594a6ac55ef1a73cf10eed90e29bcb30227fe678a16e3fef11e6fac9d1d5a644ee56e9de11d263c9882c087f
 DIST procenv-0.39.tar.gz 270745 SHA256 1ea203b28290dbabc6bd221b857b439ad4f68f38fac560d4966ff6e6a4d71922 SHA512 b34accc92445aeb9ccb1f45dc3cca2fcf25e2e9ab31e2126f086c884e2562093e292d242ba7ef3aa03e342ad8398b01c08fda133a2d8f0a87693be8cb96c621b WHIRLPOOL 2766cb8239f58bff2ee0bc66e4848f17f52b9151fc94044aeff9c766da968c7159f101b0b092121cb70165fac370b7dd237abcc09d8789db5bdcea5468e513bd
 DIST procenv-0.45.tar.gz 241046 SHA256 5fc3d650783f57fa8ba90c5e0cf0fc28f5e0bf22af38f2dbb9e8574d4e13fad3 SHA512 b9d5a9cda7ff2cc406555a2a82664e45172250af5943c882084fe0d6d067cc19cbc74b6cb9203d3be64a33797ad3c3afa8ad9d5414546ee8e047947790956ff1 WHIRLPOOL 786a80ca01569dca399436e47c335f65893cd4414eb5ef770b3100a2de5328f82792508137a3274c31932db4e81eabd1d8fd1cbcf13efe4acebfdeb9ce4359a8
diff --git a/sys-process/procenv/files/procenv-0.45-sysmacros.patch b/sys-process/procenv/files/procenv-0.45-sysmacros.patch
new file mode 100644
index 000000000000..5d7230c4bc4d
--- /dev/null
+++ b/sys-process/procenv/files/procenv-0.45-sysmacros.patch
@@ -0,0 +1,23 @@
+Since glibc is moving away from implicitly including sys/sysmacros.h all the
+time via sys/types.h, include the header directly in more places.
+
+--- procenv-0.45/src/procenv.h
++++ procenv-0.45/src/procenv.h
+@@ -59,6 +59,7 @@
+ #include <getopt.h>
+ #include <assert.h>
+ #include <sys/types.h>
++#include <sys/sysmacros.h>
+ #include <inttypes.h>
+ #include <sys/ioctl.h>
+ #include <sys/stat.h>
+--- procenv-0.45/src/util.h
++++ procenv-0.45/src/util.h
+@@ -22,6 +22,7 @@
+ #include <stdio.h>
+ #include <string.h>
+ #include <sys/types.h>
++#include <sys/sysmacros.h>
+ #include <errno.h>
+ #include <stdbool.h>
+ #include <fcntl.h>
diff --git a/sys-process/procenv/procenv-0.35.ebuild b/sys-process/procenv/procenv-0.35.ebuild
deleted file mode 100644
index 13c342a05c91..000000000000
--- a/sys-process/procenv/procenv-0.35.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-DESCRIPTION="A command-line utility that simply dumps all attributes of its environment"
-HOMEPAGE="https://launchpad.net/procenv/"
-SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
diff --git a/sys-process/procenv/procenv-0.36.ebuild b/sys-process/procenv/procenv-0.36.ebuild
deleted file mode 100644
index 13c342a05c91..000000000000
--- a/sys-process/procenv/procenv-0.36.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-DESCRIPTION="A command-line utility that simply dumps all attributes of its environment"
-HOMEPAGE="https://launchpad.net/procenv/"
-SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
diff --git a/sys-process/procenv/procenv-0.45.ebuild b/sys-process/procenv/procenv-0.45.ebuild
index 32466f277aa8..3daf7544f795 100644
--- a/sys-process/procenv/procenv-0.45.ebuild
+++ b/sys-process/procenv/procenv-0.45.ebuild
@@ -4,6 +4,8 @@
 
 EAPI=5
 
+inherit eutils
+
 DESCRIPTION="command-line utility to show process environment"
 HOMEPAGE="https://github.com/jamesodhunt/procenv"
 SRC_URI="https://github.com/jamesodhunt/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
@@ -17,3 +19,7 @@ DEPEND="
 	virtual/pkgconfig
 	test? ( dev-libs/check )
 "
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-sysmacros.patch
+}
diff --git a/x11-misc/xplanet/xplanet-1.3.1.ebuild b/x11-misc/xplanet/xplanet-1.3.1.ebuild
index 21cd769e896c..6f421b0bc927 100644
--- a/x11-misc/xplanet/xplanet-1.3.1.ebuild
+++ b/x11-misc/xplanet/xplanet-1.3.1.ebuild
@@ -14,7 +14,8 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE="gif jpeg png tiff truetype X"
 
-RDEPEND="gif? ( >media-libs/giflib-4.2 )
+RDEPEND="
+	gif? ( media-libs/giflib:= )
 	jpeg? ( virtual/jpeg:* )
 	png? (
 		media-libs/libpng:0
@@ -27,16 +28,19 @@ RDEPEND="gif? ( >media-libs/giflib-4.2 )
 		)
 	X? (
 		x11-libs/libX11
-		x11-libs/libXext
 		x11-libs/libXScrnSaver
+		x11-libs/libXext
 		x11-libs/libXt
-		)"
-DEPEND="${RDEPEND}
+		)
+"
+DEPEND="
+	${RDEPEND}
 	truetype? ( virtual/pkgconfig )
 	X? (
 		x11-proto/scrnsaverproto
 		x11-proto/xproto
-		)"
+		)
+"
 
 DOCS="AUTHORS ChangeLog NEWS README TODO"